From c43a96fe16e6a6ea091e64ca271f0788f4a0bea9 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Thu, 16 Mar 2017 15:56:59 -0400
Subject: [PATCH] lavc: Drop deprecated time_base variable for decoding
Deprecated in 10/2015.
---
libavcodec/decode.c | 5 -----
libavcodec/mpegvideo_parser.c | 5 -----
libavcodec/utils.c | 5 -----
libavcodec/version.h | 3 ---
4 files changed, 18 deletions(-)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index f4088cdae8d..e4f6a0d7270 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -354,11 +354,6 @@ static int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame)
if (ret >= 0 && avctx->codec->type == AVMEDIA_TYPE_VIDEO)
ret = pkt->size;
-#if FF_API_AVCTX_TIMEBASE
- if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
- avctx->time_base = av_inv_q(avctx->framerate);
-#endif
-
if (avctx->internal->draining && !got_frame)
avci->draining_done = 1;
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index 500d1240efa..f883b5f819c 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -163,11 +163,6 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
s->coded_width = FFALIGN(pc->width, 16);
s->coded_height = FFALIGN(pc->height, 16);
}
-
-#if FF_API_AVCTX_TIMEBASE
- if (avctx->framerate.num)
- avctx->time_base = av_inv_q(avctx->framerate);
-#endif
}
static int mpegvideo_parse(AVCodecParserContext *s,
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a6408cecbb5..bc421f67f81 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -663,11 +663,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
ret = AVERROR(EINVAL);
goto free_and_end;
}
-
-#if FF_API_AVCTX_TIMEBASE
- if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
- avctx->time_base = av_inv_q(avctx->framerate);
-#endif
}
end:
if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) && codec->init) {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b60e9715aaa..f53bdb5ccc0 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_AVCTX_TIMEBASE
-#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_MPV_OPT
#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
--
GitLab