X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fanm.c;h=9af3a4179427f7c1e7ee04f782d22f6c71e6cb9f;hb=11cb635c84cd5d011abc2aade27c7498bcf29595;hp=b31757ab0adf38b6abc21b977539dca5624cfccc;hpb=022fa7a24ea8f5000e7b6a50e57cc752f417da47;p=ffmpeg diff --git a/libavformat/anm.c b/libavformat/anm.c index b31757ab0ad..9af3a417942 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -47,7 +47,7 @@ typedef struct AnmDemuxContext { #define LPF_TAG MKTAG('L','P','F',' ') #define ANIM_TAG MKTAG('A','N','I','M') -static int probe(AVProbeData *p) +static int probe(const AVProbeData *p) { /* verify tags and video dimensions */ if (AV_RL32(&p->buf[0]) == LPF_TAG && @@ -132,12 +132,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 58); /* color cycling and palette data */ - st->codecpar->extradata_size = 16*8 + 4*256; - st->codecpar->extradata = av_mallocz(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!st->codecpar->extradata) { - return AVERROR(ENOMEM); - } - ret = avio_read(pb, st->codecpar->extradata, st->codecpar->extradata_size); + ret = ff_get_extradata(s, st->codecpar, s->pb, 16*8 + 4*256); if (ret < 0) return ret;