diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 13:43:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 13:43:44 +0200 |
| commit | 254f653b24cd110fb452531bcad13083d592354e (patch) | |
| tree | 7cd302678f8d9ac5b7ba8109f3f366388322b77a /libavcodec/mjpegdec.c | |
| parent | 879072018f682012d05a400e44df29daef831f47 (diff) | |
| download | ffmpeg-254f653b24cd110fb452531bcad13083d592354e.tar.gz | |
avcodec/jpeglsdec: add PAL8 support
Fixes Ticket3478
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3c103953f9..9f7d08fc85 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -517,6 +517,8 @@ unk_pixfmt: s->upscale_h = s->upscale_v = 0; if (s->nb_components > 1) s->avctx->pix_fmt = AV_PIX_FMT_RGB24; + else if (s->palette_index && s->bits <= 8) + s->avctx->pix_fmt = AV_PIX_FMT_PAL8; else if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GRAY8; else |