Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:52:08 +0000 (23:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:52:08 +0000 (23:52 +0200)
commitbbdef61850205f5af1a0a292fb7166c92726e93b
tree773bda2397cb13a4586d311615986ad6ca919d8a
parent84f77f84234e409271852692e736900ee7b2f0fe
parent508998f7d5cc61c7ac7b049813b47adc24c6e282
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'

* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
  avf: move riff tags accessors where they belong

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/riff.c
libavformat/utils.c