[FFmpeg-cvslog] Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  4 23:17:33 2014 +0200| [849a8c4cdb70f38a45ccd68d95c5ef3e87bd2815] | committer: Michael Niedermayer

Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'

* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4':
  oggparsevorbis: export replaygain tags from Vorbis comments

Conflicts:
	libavformat/Makefile
	libavformat/oggparsevorbis.c

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

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