diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-25 18:12:11 +0100 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:00 -0300 |
commit | df6b44182e1f52e6982a55e9720d9e46620a0d8a (patch) | |
tree | c669481a754992b97b0dc0bfea1b8f6ec85f1b77 /libavcodec | |
parent | 26ca5ebd7b5eb3d35562c2766755d765fdee0eef (diff) |
avcodec, avformat: Remove AVPacket.convergence_duration
Deprecated in 948f3c19a8bd069768ca411212aaf8c1ed96b10d.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
-rw-r--r-- | libavcodec/avpacket.c | 16 | ||||
-rw-r--r-- | libavcodec/packet.h | 10 | ||||
-rw-r--r-- | libavcodec/parser.c | 5 | ||||
-rw-r--r-- | libavcodec/version.h | 3 |
5 files changed, 0 insertions, 42 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 |