summaryrefslogtreecommitdiff
path: root/libavformat/concatdec.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-12-11 12:21:07 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-12 19:25:33 +0100
commit82d61a9ce3e26cb950709689f537ad1fdfa830b3 (patch)
tree8869800ee63dda5fa27955afe438b6aa53054644 /libavformat/concatdec.c
parentc1e439d7e9abab3cebdc937636393b1656e095d9 (diff)
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/concatdec.c')
-rw-r--r--libavformat/concatdec.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index b80294efbf..e826821241 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -171,10 +171,6 @@ static int copy_stream_props(AVStream *st, AVStream *source_st)
if (st->codecpar->codec_id || !source_st->codecpar->codec_id) {
if (st->codecpar->extradata_size < source_st->codecpar->extradata_size) {
- if (st->codecpar->extradata) {
- av_freep(&st->codecpar->extradata);
- st->codecpar->extradata_size = 0;
- }
ret = ff_alloc_extradata(st->codecpar,
source_st->codecpar->extradata_size);
if (ret < 0)