LAV
/
FFmpeg
1
0
Fork 0
Code

avformat/avformat: Remove dead check, write-only assignment 

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.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-02-03 01:11:53 +01:00
parent 97fb84d74e
commit 1d5ba34249
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avformat.c
View File

@ -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) {