mirror of https://git.ffmpeg.org/ffmpeg.git
lavc: Drop deprecated time_base variable for decoding
Deprecated in 10/2015.
This commit is contained in:
parent
48bb0da050
commit
c43a96fe16
|
@ -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;
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue