[FFmpeg-cvslog] Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 23:52:08 2013 +0200| [bbdef61850205f5af1a0a292fb7166c92726e93b] | committer: Michael Niedermayer

Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'

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

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbdef61850205f5af1a0a292fb7166c92726e93b
---