summaryrefslogtreecommitdiff
path: root/libavcodec/libx264.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-05-04 11:50:48 +0200
committerAnton Khirnov <anton@khirnov.net>2023-05-15 10:56:18 +0200
commit7d1d61cc5f57708434ba720b03234b3dd93a4d1e (patch)
tree06bb3e329dcb5d9e1ce9083e6e82ed48f70d1135 /libavcodec/libx264.c
parent2953ebe7b6925b045e5652420cf07146fbbb17ab (diff)
lavc: deprecate AVCodecContext.ticks_per_frame
For encoding, this field is entirely redundant with AVCodecContext.framerate. For decoding, this field is entirely redundant with AV_CODEC_PROP_FIELDS.
Diffstat (limited to 'libavcodec/libx264.c')
-rw-r--r--libavcodec/libx264.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 3aea29e995..5736f1efa7 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1018,7 +1018,13 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.i_fps_den = avctx->framerate.den;
} else {
x4->params.i_fps_num = avctx->time_base.den;
- x4->params.i_fps_den = avctx->time_base.num * avctx->ticks_per_frame;
+FF_DISABLE_DEPRECATION_WARNINGS
+ x4->params.i_fps_den = avctx->time_base.num
+#if FF_API_TICKS_PER_FRAME
+ * avctx->ticks_per_frame
+#endif
+ ;
+FF_ENABLE_DEPRECATION_WARNINGS
}
x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR;