[FFmpeg-cvslog] Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'
Michael Niedermayer
git at videolan.org
Thu Mar 13 21:22:33 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 21:17:46 2014 +0100| [2631d155baa5bf9e335925d44fcfd276c6d3719f] | committer: Michael Niedermayer
Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'
* commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f':
build: Drop stray MJPEG encoder dependency on dsputil
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2631d155baa5bf9e335925d44fcfd276c6d3719f
---
More information about the ffmpeg-cvslog
mailing list