[FFmpeg-cvslog] r15437 - trunk/libavcodec/mjpegdec.c

[michael]

Author: michael
Date: Sat Sep 27 04:39:24 2008
New Revision: 15437

Log:
Replace apparently always true condition by assert().


Modified:
   trunk/libavcodec/mjpegdec.c

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	(original)
+++ trunk/libavcodec/mjpegdec.c	Sat Sep 27 04:39:24 2008
@@ -298,10 +298,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeConte
     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;