[FFmpeg-cvslog] Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'
Michael Niedermayer
git at videolan.org
Mon Jun 23 00:45:16 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:39:53 2014 +0200| [9d91fae8a1091393ad96585324acc2328d8138f2] | committer: Michael Niedermayer
Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'
* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
build: Have the eatqi decoder depend on the MPEG-1 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d91fae8a1091393ad96585324acc2328d8138f2
---
More information about the ffmpeg-cvslog
mailing list