har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mjpegdec: support more pix_fmt_ids for grayscale

Browse Source 
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>
This commit is contained in:
Piotr Bandurski 2012-12-08 17:34:10 +01:00 committed by Michael Niedermayer
parent 0ad654d4c9
commit e5550c0d09
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mjpegdec.c
View File

@ -388,6 +388,14 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->chroma_height = s->height / 2; s->chroma_height = s->height / 2;
break; break;
case 0x11000000: case 0x11000000:
case 0x13000000:
case 0x14000000:
case 0x31000000:
case 0x33000000:
case 0x34000000:
case 0x41000000:
case 0x43000000:
case 0x44000000:
if(s->bits <= 8) if(s->bits <= 8)
s->avctx->pix_fmt = AV_PIX_FMT_GRAY8; s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
else else