tests/audio_fifo: fix buffer allocation for non planar formats

[ffmpeg] / libavcodec / smc.c

diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index 69d78ad1d1a8dfe8828a56f9f53eb8240d7e4329..89524219f8a5e6ea2e1193f5d8a8489a695c7add 100644 (file)
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -431,7 +431,8 @@ static int smc_decode_frame(AVCodecContext *avctx,
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     SmcContext *s = avctx->priv_data;
-    const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+    int pal_size;
+    const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size);
     int ret;
 
     bytestream2_init(&s->gb, buf, buf_size);
@@ -439,9 +440,11 @@ static int smc_decode_frame(AVCodecContext *avctx,
     if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;
 
-    if (pal) {
+    if (pal && pal_size == AVPALETTE_SIZE) {
         s->frame->palette_has_changed = 1;
         memcpy(s->pal, pal, AVPALETTE_SIZE);
+    } else if (pal) {
+        av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size);
     }
 
     smc_decode_stream(s);