avcodec/mjpegdec: simplify rgb index remaping
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 6 Jul 2018 13:45:41 +0000 (15:45 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 11 Sep 2018 22:52:01 +0000 (00:52 +0200)
libavcodec/mjpegdec.c

index 5e784d9..35ee10d 100644 (file)
@@ -1600,9 +1600,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
         s->h_scount[i]  = s->h_count[index];
         s->v_scount[i]  = s->v_count[index];
 
-        if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P)
-            index = (i+2)%3;
-        if(nb_components == 1 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P)
+        if((nb_components == 1 || nb_components == 3) && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P)
             index = (index+2)%3;
 
         s->comp_index[i] = index;