summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavcodec/avcodec.h8
-rw-r--r--libavcodec/avpacket.c16
-rw-r--r--libavcodec/packet.h10
-rw-r--r--libavcodec/parser.c5
-rw-r--r--libavcodec/version.h3
-rw-r--r--libavformat/matroskadec.c8
-rw-r--r--libavformat/matroskaenc.c8
-rw-r--r--libavformat/srtenc.c7
-rw-r--r--libavformat/utils.c6
9 files changed, 0 insertions, 71 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b46b858416..81a18e2cde 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3386,14 +3386,6 @@ typedef struct AVCodecParserContext {
*/
int key_frame;
-#if FF_API_CONVERGENCE_DURATION
- /**
- * @deprecated unused
- */
- attribute_deprecated
- int64_t convergence_duration;
-#endif
-
// Timestamp generation support:
/**
* Synchronization point for start of timestamp generation.
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index b5bac5c5f2..b726a8db0e 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -39,11 +39,6 @@ void av_init_packet(AVPacket *pkt)
pkt->dts = AV_NOPTS_VALUE;
pkt->pos = -1;
pkt->duration = 0;
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- pkt->convergence_duration = 0;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->flags = 0;
pkt->stream_index = 0;
pkt->buf = NULL;
@@ -605,11 +600,6 @@ int av_packet_copy_props(AVPacket *dst, const AVPacket *src)
dst->dts = src->dts;
dst->pos = src->pos;
dst->duration = src->duration;
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- dst->convergence_duration = src->convergence_duration;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
dst->flags = src->flags;
dst->stream_index = src->stream_index;
@@ -742,12 +732,6 @@ void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb)
pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb);
if (pkt->duration > 0)
pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb);
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- if (pkt->convergence_duration > 0)
- pkt->convergence_duration = av_rescale_q(pkt->convergence_duration, src_tb, dst_tb);
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
int avpriv_packet_list_put(PacketList **packet_buffer,
diff --git a/libavcodec/packet.h b/libavcodec/packet.h
index ca18ae631f..47e9b8999b 100644
--- a/libavcodec/packet.h
+++ b/libavcodec/packet.h
@@ -387,16 +387,6 @@ typedef struct AVPacket {
int64_t duration;
int64_t pos; ///< byte position in stream, -1 if unknown
-
-#if FF_API_CONVERGENCE_DURATION
- /**
- * @deprecated Same as the duration field, but as int64_t. This was required
- * for Matroska subtitles, whose duration values could overflow when the
- * duration field was still an int.
- */
- attribute_deprecated
- int64_t convergence_duration;
-#endif
} AVPacket;
#if FF_API_INIT_PACKET
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 11c41d6a0a..08b9945a57 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -67,11 +67,6 @@ found:
goto err_out;
}
s->key_frame = -1;
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- s->convergence_duration = 0;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
s->dts_sync_point = INT_MIN;
s->dts_ref_dts_delta = INT_MIN;
s->pts_dts_delta = INT_MIN;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index a6b6ffc799..d4a48b026b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -57,9 +57,6 @@
#ifndef FF_API_VDPAU_PROFILE
#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
-#ifndef FF_API_CONVERGENCE_DURATION
-#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
#ifndef FF_API_AVPICTURE
#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index e8c76f9cfb..116e331215 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3572,14 +3572,6 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
pkt->pos = pos;
pkt->duration = lace_duration;
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- if (st->codecpar->codec_id == AV_CODEC_ID_SUBRIP) {
- pkt->convergence_duration = lace_duration;
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
res = avpriv_packet_list_put(&matroska->queue, &matroska->queue_end, pkt, NULL, 0);
if (res < 0) {
av_packet_unref(pkt);
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 0141fb0b8d..b36e86ecb1 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2372,14 +2372,6 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
mkv_blockgroup_size(pkt->size,
track->track_num_size));
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- /* For backward compatibility, prefer convergence_duration. */
- if (pkt->convergence_duration > 0) {
- duration = pkt->convergence_duration;
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
/* All subtitle blocks are considered to be keyframes. */
mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 1);
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c
index 484dd4d230..9bb0ff94c1 100644
--- a/libavformat/srtenc.c
+++ b/libavformat/srtenc.c
@@ -73,13 +73,6 @@ static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt)
y2 = AV_RL32(p + 12);
}
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- if (d <= 0)
- /* For backward compatibility, fallback to convergence_duration. */
- d = pkt->convergence_duration;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (s == AV_NOPTS_VALUE || d < 0) {
av_log(avf, AV_LOG_WARNING,
"Insufficient timestamps in event number %d.\n", srt->index);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 02768aca1f..322ccd3af2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1439,12 +1439,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
/* update flags */
if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || ff_is_intra_only(st->codecpar->codec_id))
pkt->flags |= AV_PKT_FLAG_KEY;
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- if (pc)
- pkt->convergence_duration = pc->convergence_duration;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 16:07:03 +0000