[FFmpeg-cvslog] Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'
Michael Niedermayer
git at videolan.org
Fri Dec 6 13:54:40 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 13:48:20 2013 +0100| [fb98ca575d64452dba55a60c4ddf571163f0ca81] | committer: Michael Niedermayer
Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'
* commit 'daffed3b173c59d64907747bf3309e98a8974f4e':
ljpegenc: accept bgr24 instead of bgra
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
Only whitespace merged, we continue to support both formats
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb98ca575d64452dba55a60c4ddf571163f0ca81
---
More information about the ffmpeg-cvslog
mailing list