[FFmpeg-cvslog] Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
Michael Niedermayer
git at videolan.org
Mon Mar 24 14:13:10 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 14:03:55 2014 +0100| [83e89787984d3f96cb793ebfddc6078d6bc50073] | committer: Michael Niedermayer
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
Add replaygain side data type and code for parsing replaygain tags.
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83e89787984d3f96cb793ebfddc6078d6bc50073
---
More information about the ffmpeg-cvslog
mailing list