]> git.sesse.net Git - ffmpeg/commitdiff
avformat/utils: add missing FF_API_LAVF_AVCTX check
authorJames Almer <jamrial@gmail.com>
Fri, 2 Oct 2020 01:47:51 +0000 (22:47 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 2 Oct 2020 01:47:51 +0000 (22:47 -0300)
Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/utils.c

index cf0654d416076cd4c8ca1e543f1944a5f2447afd..a2e701ea1a6c38d8f1fb29ffa4f016db45e5bb56 100644 (file)
@@ -5704,8 +5704,18 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt,
                                                   enum AVTimebaseSource copy_tb)
 {
     //TODO: use [io]st->internal->avctx
-    const AVCodecContext *dec_ctx = ist->codec;
-    AVCodecContext       *enc_ctx = ost->codec;
+    const AVCodecContext *dec_ctx;
+    AVCodecContext       *enc_ctx;
+
+#if FF_API_LAVF_AVCTX
+FF_DISABLE_DEPRECATION_WARNINGS
+    dec_ctx = ist->codec;
+    enc_ctx = ost->codec;
+FF_ENABLE_DEPRECATION_WARNINGS
+#else
+    dec_ctx = ist->internal->avctx;
+    enc_ctx = ost->internal->avctx;
+#endif
 
     enc_ctx->time_base = ist->time_base;
     /*