Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/flvdec: propagate av_packet_add_side_data failure

Browse source
This commit is contained in:
Timo Rothenpieler 2024-12-22 03:06:17 +01:00
parent 741e49c56f
commit 770f0a2434
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libavformat/flvdec.c
View file

@ -1721,21 +1721,23 @@ retry_duration:
ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
flv->new_extradata[stream_type], flv->new_extradata[stream_type],
flv->new_extradata_size[stream_type]); flv->new_extradata_size[stream_type]);
if (ret >= 0) { if (ret < 0)
return ret;
flv->new_extradata[stream_type] = NULL; flv->new_extradata[stream_type] = NULL;
flv->new_extradata_size[stream_type] = 0; flv->new_extradata_size[stream_type] = 0;
}
} else if (multitrack && } else if (multitrack &&
flv->mt_extradata_cnt > track_idx && flv->mt_extradata_cnt > track_idx &&
flv->mt_extradata[track_idx]) { flv->mt_extradata[track_idx]) {
ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
flv->mt_extradata[track_idx], flv->mt_extradata[track_idx],
flv->mt_extradata_sz[track_idx]); flv->mt_extradata_sz[track_idx]);
if (ret >= 0) { if (ret < 0)
return ret;
flv->mt_extradata[track_idx] = NULL; flv->mt_extradata[track_idx] = NULL;
flv->mt_extradata_sz[track_idx] = 0; flv->mt_extradata_sz[track_idx] = 0;
} }
}
if (stream_type == FLV_STREAM_TYPE_AUDIO && !enhanced_flv && if (stream_type == FLV_STREAM_TYPE_AUDIO && !enhanced_flv &&
(sample_rate != flv->last_sample_rate || (sample_rate != flv->last_sample_rate ||
channels != flv->last_channels)) { channels != flv->last_channels)) {