[FFmpeg-cvslog] Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'

Michael Niedermayer git at videolan.org
Fri Dec 6 11:21:58 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 11:04:27 2013 +0100| [d8fb209a7fbe0256a86df578b0c8d284e2a0d3e2] | committer: Michael Niedermayer

Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'

* commit '058d5f2feb730846f22c1812e433f92f670ad751':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()

Conflicts:
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8fb209a7fbe0256a86df578b0c8d284e2a0d3e2
---





More information about the ffmpeg-cvslog mailing list