diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdxl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdxl.c
index 93a5537e3..9469af54b 100644
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdxl.c
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdxl.c
@@ -256,7 +256,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data,
         return AVERROR_INVALIDDATA;
     if (!encoding && c->palette_size && c->bpp <= 8) {
         avctx->pix_fmt = AV_PIX_FMT_PAL8;
-    } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8)) {
+    } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8) && c->format != CHUNKY) {
         if (c->palette_size != (1 << (c->bpp - 1)))
             return AVERROR_INVALIDDATA;
         avctx->pix_fmt = AV_PIX_FMT_BGR24;
diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/cdxl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/cdxl.c
index 50d514b25..9c13adcc0 100644
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/cdxl.c
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/cdxl.c
@@ -256,7 +256,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data,
         return AVERROR_INVALIDDATA;
     if (!encoding && c->palette_size && c->bpp <= 8) {
         avctx->pix_fmt = AV_PIX_FMT_PAL8;
-    } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8)) {
+    } else if (encoding == 1 && (c->bpp == 6 || c->bpp == 8) && c->format != CHUNKY) {
         if (c->palette_size != (1 << (c->bpp - 1)))
             return AVERROR_INVALIDDATA;
         avctx->pix_fmt = AV_PIX_FMT_BGR24;