[FFmpeg-cvslog] Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
Michael Niedermayer
git at videolan.org
Mon Mar 24 14:36:15 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 14:26:17 2014 +0100| [c08e523586b6be36bee3f73d609733cd80a57674] | committer: Michael Niedermayer
Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
libavcodec: when decoding, copy replaygain side data to decoded frames
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c08e523586b6be36bee3f73d609733cd80a57674
---
More information about the ffmpeg-cvslog
mailing list