[FFmpeg-cvslog] Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 12:45:20 2015 +0100| [06ec2f1d321830e3a7dd24e3d0a10bd886c8c74b] | committer: Michael Niedermayer

Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'

* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce':
  id3v2: constify the 'tag' parameter to special metadata parsing callback

Conflicts:
	libavformat/id3v2.c

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

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