diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-02-09 23:26:28 +0100 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-02-09 23:26:28 +0100 |
commit | 52719dae8a45cec2eb2851b1c14da978e8885e94 (patch) | |
tree | 7f56dffb2af561ccd7322da11e0efe618a2db72b /libavcodec/mjpegenc.c | |
parent | edf34c346ec9d5d1a790db4b500113bf8d5fac07 (diff) | |
download | ffmpeg-52719dae8a45cec2eb2851b1c14da978e8885e94.tar.gz |
Support encoding BGR24 and BGR0 in ljpeg.
Diffstat (limited to 'libavcodec/mjpegenc.c')
-rw-r--r-- | libavcodec/mjpegenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 4e77e0d659..bddcc0d041 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -214,7 +214,9 @@ void ff_mjpeg_encode_picture_header(MpegEncContext *s) } put_bits(&s->pb, 16, 17); - if(lossless && s->avctx->pix_fmt == PIX_FMT_BGRA) + if(lossless && (s->avctx->pix_fmt == PIX_FMT_BGR0 + || s->avctx->pix_fmt == PIX_FMT_BGRA + || s->avctx->pix_fmt == PIX_FMT_BGR24)) put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */ else put_bits(&s->pb, 8, 8); /* 8 bits/component */ |