[FFmpeg-cvslog] Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
Michael Niedermayer
git at videolan.org
Fri Dec 6 11:46:09 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 11:40:30 2013 +0100| [0f057ea3c5484d7df8a951c1fdeb8b873ae382e2] | committer: Michael Niedermayer
Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()
Conflicts:
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f057ea3c5484d7df8a951c1fdeb8b873ae382e2
---
More information about the ffmpeg-cvslog
mailing list