]> git.sesse.net Git - ffmpeg/commitdiff
avformat/flvenc: Don't reimplement ff_alloc_extradata
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tue, 10 Dec 2019 01:41:44 +0000 (02:41 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 11 Dec 2019 15:24:16 +0000 (16:24 +0100)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/flvenc.c

index 872050a74f876f36a00c51d6c1dceaa0010f5968..862082dd2de25dc4aa57505db66cbb2ec541aef5 100644 (file)
@@ -908,14 +908,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
         int side_size = 0;
         uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size);
         if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) {
-            av_free(par->extradata);
-            par->extradata = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE);
-            if (!par->extradata) {
-                par->extradata_size = 0;
-                return AVERROR(ENOMEM);
-            }
+            ret = ff_alloc_extradata(par, side_size);
+            if (ret < 0)
+                return ret;
             memcpy(par->extradata, side, side_size);
-            par->extradata_size = side_size;
             flv_write_codec_header(s, par, pkt->dts);
         }
     }