From 82d61a9ce3e26cb950709689f537ad1fdfa830b3 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 11 Dec 2019 12:21:07 +0100 Subject: avformat: Don't free old extradata before ff_alloc/get_extradata These functions already free it themselves before they allocate the new extradata. Signed-off-by: Andreas Rheinhardt Signed-off-by: Michael Niedermayer --- libavformat/cafdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libavformat/cafdec.c') diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 85356ec439..d0f942f3e4 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -135,7 +135,6 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) return AVERROR_INVALIDDATA; } - av_freep(&st->codecpar->extradata); if ((ret = ff_alloc_extradata(st->codecpar, ALAC_HEADER)) < 0) return ret; @@ -175,10 +174,8 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) return AVERROR_PATCHWELCOME; } avio_skip(pb, size); - } else { - av_freep(&st->codecpar->extradata); - if ((ret = ff_get_extradata(s, st->codecpar, pb, size)) < 0) - return ret; + } else if ((ret = ff_get_extradata(s, st->codecpar, pb, size)) < 0) { + return ret; } return 0; -- cgit v1.2.3