diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-12-11 12:21:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-12 19:25:33 +0100 |
| commit | 82d61a9ce3e26cb950709689f537ad1fdfa830b3 (patch) | |
| tree | 8869800ee63dda5fa27955afe438b6aa53054644 /libavformat/cafdec.c | |
| parent | c1e439d7e9abab3cebdc937636393b1656e095d9 (diff) | |
| download | ffmpeg-82d61a9ce3e26cb950709689f537ad1fdfa830b3.tar.gz | |
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 <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/cafdec.c')
| -rw-r--r-- | libavformat/cafdec.c | 7 |
1 files changed, 2 insertions, 5 deletions
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; |