mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-23 04:24:35 +02:00
avformat/flvenc: Don't reimplement ff_alloc_extradata
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
91f775e0c5
commit
a6d292b954
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user