Commit 766a4a99 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Replace apparently always true condition by assert().

Originally committed as revision 15437 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c2c7342b
...@@ -298,10 +298,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -298,10 +298,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
case 0x11111100: case 0x11111100:
if(s->rgb){ if(s->rgb){
s->avctx->pix_fmt = PIX_FMT_RGB32; 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; s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P;
else assert(s->nb_components==3);
s->avctx->pix_fmt = PIX_FMT_GRAY8;
break; break;
case 0x11000000: case 0x11000000:
s->avctx->pix_fmt = PIX_FMT_GRAY8; s->avctx->pix_fmt = PIX_FMT_GRAY8;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment