Browse Source

anm decoder: move buffer allocation from decode_init() to decode_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
tags/n0.11
Peter Ross Ronald S. Bultje 13 years ago
parent
commit
015da6e394
1 changed files with 4 additions and 5 deletions
  1. +4
    -5
      libavcodec/anm.c

+ 4
- 5
libavcodec/anm.c View File

@@ -29,6 +29,7 @@

typedef struct AnmContext {
AVFrame frame;
int palette[AVPALETTE_COUNT];
int x; ///< x coordinate position
} AnmContext;

@@ -44,14 +45,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
return -1;

s->frame.reference = 1;
if (avctx->get_buffer(avctx, &s->frame) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}

buf = avctx->extradata + 16*8;
for (i = 0; i < 256; i++)
((uint32_t*)s->frame.data[1])[i] = bytestream_get_le32(&buf);
s->palette[i] = bytestream_get_le32(&buf);

return 0;
}
@@ -172,6 +169,8 @@ static int decode_frame(AVCodecContext *avctx,
}
} while (buf + 1 < buf_end);

memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);

*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
return buf_size;


Loading…
Cancel
Save