[FFmpeg-cvslog] Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'
Michael Niedermayer
git at videolan.org
Sat Mar 1 12:23:48 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 1 12:17:51 2014 +0100| [ad48c9374e13ecdf1399c44e9ea443a77232168a] | committer: Michael Niedermayer
Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'
* commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde':
build: Let all MJPEG-related decoders depend on the MJPEG decoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad48c9374e13ecdf1399c44e9ea443a77232168a
---
More information about the ffmpeg-cvslog
mailing list