For muxers, the internal AVCodecContext is basically unused
except in avformat_transfer_internal_stream_timing_info()
(which sets time_base and ticks_per_frame) and
av_stream_get_codec_timebase() (a getter for time_base).
This makes ticks_per_frame write-only, so don't set it.
Also remove an always-false check for the AVCodecContext's
codec_tag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavformat/avformat.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/libavformat/avformat.c b/libavformat/avformat.c
index 8e8c6fbe55..1a99598d6f 100644
--- a/libavformat/avformat.c
+++ b/libavformat/avformat.c
@@ -775,11 +775,6 @@ int avformat_transfer_internal_stream_timing_info(const
AVOutputFormat *ofmt,
|| copy_tb == AVFMT_TBCF_R_FRAMERATE) {
enc_ctx->time_base.num = ist->r_frame_rate.den;
enc_ctx->time_base.den = 2*ist->r_frame_rate.num;
-#if FF_API_TICKS_PER_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
- enc_ctx->ticks_per_frame = 2;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
} else
#endif
if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx->framerate.num &&
@@ -792,7 +787,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
#if FF_API_TICKS_PER_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
enc_ctx->time_base.num *= dec_ctx->ticks_per_frame;
- enc_ctx->ticks_per_frame = 2;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
}
@@ -812,7 +806,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
}
- if ((enc_ctx->codec_tag == AV_RL32("tmcd") || ost->codecpar->codec_tag ==
AV_RL32("tmcd"))
+ if (ost->codecpar->codec_tag == AV_RL32("tmcd")
&& dec_ctx_tb.num < dec_ctx_tb.den
&& dec_ctx_tb.num > 0
&& 121LL*dec_ctx_tb.num > dec_ctx_tb.den) {
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
