diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:48:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:48:20 +0100 |
| commit | fb98ca575d64452dba55a60c4ddf571163f0ca81 (patch) | |
| tree | 462efba501471ae7d9c4d8a634429724f614ceff /libavcodec/vima.c | |
| parent | 6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa (diff) | |
| parent | daffed3b173c59d64907747bf3309e98a8974f4e (diff) | |
| download | ffmpeg-fb98ca575d64452dba55a60c4ddf571163f0ca81.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/vima.c')
0 files changed, 0 insertions, 0 deletions