diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2012-12-08 17:34:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 19:24:09 +0100 |
| commit | e5550c0d0971e393ba221cd69506acd2c2dab89c (patch) | |
| tree | 52ded384d401dc5c5f909a58383f450766842008 /libavcodec/mjpegdec.c | |
| parent | 0ad654d4c987175ab4ab4088469e131c2f4b4004 (diff) | |
| download | ffmpeg-e5550c0d0971e393ba221cd69506acd2c2dab89c.tar.gz | |
mjpegdec: support more pix_fmt_ids for grayscale
samples created with
"cjpeg -grayscale -sample 1x3 / 1x4 / 3x1 / 3x3 / 4x1 / 4x3 / 4x4"
http://www.datafilehost.com/download-d828329d.html
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b0dd85e33d..cb500d481e 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -388,6 +388,14 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->chroma_height = s->height / 2; break; case 0x11000000: + case 0x13000000: + case 0x14000000: + case 0x31000000: + case 0x33000000: + case 0x34000000: + case 0x41000000: + case 0x43000000: + case 0x44000000: if(s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GRAY8; else |