diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-27 02:39:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-27 02:39:24 +0000 |
| commit | 766a4a99e2f5835aba413490c0efb68328d5dd21 (patch) | |
| tree | aa71fc6f7b87d064c2ebe724500d7215e0605350 /libavcodec/mjpegdec.c | |
| parent | c2c7342b700222de68028ebd8b149fd1462b1b04 (diff) | |
Replace apparently always true condition by assert().
Originally committed as revision 15437 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index bb088b5c6e..e8a34ef2ba 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -298,10 +298,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x11111100: if(s->rgb){ s->avctx->pix_fmt = PIX_FMT_RGB32; - }else if(s->nb_components==3) + }else s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P; - else - s->avctx->pix_fmt = PIX_FMT_GRAY8; + assert(s->nb_components==3); break; case 0x11000000: s->avctx->pix_fmt = PIX_FMT_GRAY8; |