diff options
| author | James Almer <jamrial@gmail.com> | 2025-02-19 12:47:24 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2025-03-28 14:33:07 -0300 |
| commit | ec8e796b42bccf999fdf31c110385e2cc119b7f2 (patch) | |
| tree | 628602fe58d7fec9bda484c195635e7817be2fbe /libavformat/mux.c | |
| parent | c153238275c28ec1891df696114c152285dc9680 (diff) | |
| download | ffmpeg-ec8e796b42bccf999fdf31c110385e2cc119b7f2.tar.gz | |
avformat: remove deprecated FF_API_AVSTREAM_SIDE_DATA
Deprecated since 2023-10-06.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 60204f6266..db3b6c2bfe 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -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) |