#include <string.h>
#include "avcodec.h"
+#include "decode.h"
#include "internal.h"
#include "msrledec.h"
#include "libavutil/imgutils.h"
AVFrame *frame;
GetByteContext gb;
- const unsigned char *buf;
- int size;
uint32_t pal[256];
} MsrleContext;
int istride = FFALIGN(avctx->width*avctx->bits_per_coded_sample, 32) / 8;
int ret;
- s->buf = buf;
- s->size = buf_size;
+ if (buf_size < 2) //Minimally a end of picture code should be there
+ return AVERROR_INVALIDDATA;
- if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
+ if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0)
return ret;
if (avctx->bits_per_coded_sample > 1 && 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) {
- 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", size);
- }
+ s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx);
+
/* make the palette available */
memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
}
return buf_size;
}
+static void msrle_decode_flush(AVCodecContext *avctx)
+{
+ MsrleContext *s = avctx->priv_data;
+
+ av_frame_unref(s->frame);
+}
+
static av_cold int msrle_decode_end(AVCodecContext *avctx)
{
MsrleContext *s = avctx->priv_data;
return 0;
}
-AVCodec ff_msrle_decoder = {
+const AVCodec ff_msrle_decoder = {
.name = "msrle",
.long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"),
.type = AVMEDIA_TYPE_VIDEO,
.init = msrle_decode_init,
.close = msrle_decode_end,
.decode = msrle_decode_frame,
+ .flush = msrle_decode_flush,
.capabilities = AV_CODEC_CAP_DR1,
};