Commit a6d292b9 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt Committed by Michael Niedermayer

avformat/flvenc: Don't reimplement ff_alloc_extradata

Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 91f775e0
...@@ -908,14 +908,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -908,14 +908,10 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
int side_size = 0; int side_size = 0;
uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); 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))) { if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) {
av_free(par->extradata); ret = ff_alloc_extradata(par, side_size);
par->extradata = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); if (ret < 0)
if (!par->extradata) { return ret;
par->extradata_size = 0;
return AVERROR(ENOMEM);
}
memcpy(par->extradata, side, side_size); memcpy(par->extradata, side, side_size);
par->extradata_size = side_size;
flv_write_codec_header(s, par, pkt->dts); flv_write_codec_header(s, par, pkt->dts);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment