You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-11-23 21:54:53 +02:00
avformat: remove deprecated FF_API_AVSTREAM_SIDE_DATA
Deprecated since 2023-10-06. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@@ -295,27 +295,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
|
||||
}
|
||||
}
|
||||
|
||||
#if FF_API_AVSTREAM_SIDE_DATA
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
/* if the caller is using the deprecated AVStream side_data API,
|
||||
* copy its contents to AVStream.codecpar, giving it priority
|
||||
over existing side data in the latter */
|
||||
for (int i = 0; i < st->nb_side_data; i++) {
|
||||
const AVPacketSideData *sd_src = &st->side_data[i];
|
||||
AVPacketSideData *sd_dst;
|
||||
|
||||
sd_dst = av_packet_side_data_new(&st->codecpar->coded_side_data,
|
||||
&st->codecpar->nb_coded_side_data,
|
||||
sd_src->type, sd_src->size, 0);
|
||||
if (!sd_dst) {
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
}
|
||||
memcpy(sd_dst->data, sd_src->data, sd_src->size);
|
||||
}
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
|
||||
desc = avcodec_descriptor_get(par->codec_id);
|
||||
if (desc && desc->props & AV_CODEC_PROP_REORDER)
|
||||
sti->reorder = 1;
|
||||
@@ -965,7 +944,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt,
|
||||
int stream_count = 0;
|
||||
int noninterleaved_count = 0;
|
||||
int ret;
|
||||
int eof = flush;
|
||||
|
||||
if (has_packet) {
|
||||
if ((ret = ff_interleave_add_packet(s, pkt, interleave_compare_dts)) < 0)
|
||||
|
||||
Reference in New Issue
Block a user