X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2F8bps.c;h=dda8b8b1c956070d835f661f7b25c68c0fded8df;hb=f34521266ec5816eefa4c10db6098cb91e03c695;hp=aa2318fa2d817288ba6bc604076e04b0fa9c19c1;hpb=29929fc8e2449d2db8bd144b2badc8d1e6347412;p=ffmpeg diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index aa2318fa2d8..dda8b8b1c95 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -37,6 +37,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "decode.h" #include "internal.h" @@ -122,16 +123,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, } if (avctx->bits_per_coded_sample <= 8) { - int size; - const uint8_t *pal = av_packet_get_side_data(avpkt, - AV_PKT_DATA_PALETTE, - &size); - if (pal && size == AVPALETTE_SIZE) { - frame->palette_has_changed = 1; - memcpy(c->pal, pal, AVPALETTE_SIZE); - } else if (pal) { - av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size); - } + frame->palette_has_changed = ff_copy_palette(c->pal, avpkt, avctx); memcpy (frame->data[1], c->pal, AVPALETTE_SIZE); }