Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

[ffmpeg] / libavcodec / 8bps.c

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index d01ef924c796cae2a8221b516580c794e3b5ba78..1709368c658a58f1a5f29b9b806f9c60d4786958 100644 (file)
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -119,7 +119,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
         }
     }
 
-    if (avctx->bits_per_coded_sample <= 8) {
+    if ((avctx->bits_per_coded_sample & 0x1f) <= 8) {
         const uint8_t *pal = av_packet_get_side_data(avpkt,
                                                      AV_PKT_DATA_PALETTE,
                                                      NULL);