X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fcdxl.c;h=5c0ecb279c7026e0ffd5aac036bd104ca44ae22b;hp=7a9b41943d8163573b84c6f94070e06398a43edb;hb=e1b60aad77c27ed5d4dfc11e5e6a05a38c70489d;hpb=277e397eb5964999bd76909f52d4bd3350289c22 diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 7a9b41943d..5c0ecb279c 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -277,7 +277,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data, c->padded_bits = aligned_width - c->avctx->width; if (c->video_size < aligned_width * avctx->height * (int64_t)c->bpp / 8) return AVERROR_INVALIDDATA; - if (!encoding && c->palette_size && c->bpp <= 8) { + if (!encoding && c->palette_size && c->bpp <= 8 && c->format != CHUNKY) { avctx->pix_fmt = AV_PIX_FMT_PAL8; } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8)) { if (c->palette_size != (1 << (c->bpp - 1)))