[FFmpeg-cvslog] Merge commit '49470b9404583ab3aff6835f78a759349d331696'
Michael Niedermayer
git at videolan.org
Mon Jun 23 00:18:45 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:13:34 2014 +0200| [2ca4802601c2c413af38cf2d870b03d63dbcf9b2] | committer: Michael Niedermayer
Merge commit '49470b9404583ab3aff6835f78a759349d331696'
* commit '49470b9404583ab3aff6835f78a759349d331696':
build: Add missing replaygain object file for CAF demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ca4802601c2c413af38cf2d870b03d63dbcf9b2
---
More information about the ffmpeg-cvslog
mailing list