[FFmpeg-cvslog] Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'

Michael Niedermayer git at videolan.org
Tue Nov 11 21:35:46 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 21:33:27 2014 +0100| [8d6b51b18206a133d985f4cc065945b696ed5058] | committer: Michael Niedermayer

Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'

* commit 'db71c4926d948717ce3b74253eb385dc43dcb14d':
  mjpegenc: fix argument size in encode_mb

Conflicts:
	libavcodec/mjpegenc.c
	libavcodec/mjpegenc.h

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

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





More information about the ffmpeg-cvslog mailing list