[FFmpeg-cvslog] Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'
Michael Niedermayer
git at videolan.org
Fri Dec 6 11:39:49 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 11:33:07 2013 +0100| [b342ea603f0c767759639a002b9db638231e989c] | committer: Michael Niedermayer
Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'
* commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b342ea603f0c767759639a002b9db638231e989c
---
More information about the ffmpeg-cvslog
mailing list