[FFmpeg-cvslog] Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'

Michael Niedermayer git at videolan.org
Fri Dec 6 14:07:27 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 14:01:54 2013 +0100| [711c664a0e491a859d951f0d98807ec4327da283] | committer: Michael Niedermayer

Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'

* commit 'b73a8922d818c7f909855557718d4c3bfacbd92d':
  ljpegenc: split yuv encoding into a separate function

Conflicts:
	libavcodec/ljpegenc.c

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

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





More information about the ffmpeg-cvslog mailing list