diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-06 15:45:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-09-12 00:52:01 +0200 |
| commit | 09f0429b9961ea77a60b07afb62082e5565decd4 (patch) | |
| tree | 079aadecad6ebb811db39a2b5d01d106c7b91518 /libavcodec | |
| parent | ff21d4735ed063229536cb0d5d103d9aebdfb90c (diff) | |
avcodec/mjpegdec: simplify rgb index remaping
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5e784d980c..35ee10d987 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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; |