summaryrefslogtreecommitdiff
path: root/libavformat/matroskaenc.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-25 18:12:11 +0100
committerJames Almer <jamrial@gmail.com>2021-04-27 10:43:00 -0300
commitdf6b44182e1f52e6982a55e9720d9e46620a0d8a (patch)
treec669481a754992b97b0dc0bfea1b8f6ec85f1b77 /libavformat/matroskaenc.c
parent26ca5ebd7b5eb3d35562c2766755d765fdee0eef (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 'libavformat/matroskaenc.c')
-rw-r--r--libavformat/matroskaenc.c8
1 files changed, 0 insertions, 8 deletions
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);