[FFmpeg-cvslog] ffmpeg: drop useless framerate assignments
Anton Khirnov
git at videolan.org
Tue Dec 7 12:29:18 EET 2021
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 16 12:06:02 2021 +0100| [bb6f591c4938b98b748e43625a54015486a6ed94] | committer: Anton Khirnov
ffmpeg: drop useless framerate assignments
If the input stream framerate is known, it will be configured on the
relevant filtergraph input and get propagated to the output stream in
the above line. That makes these assignments redundant.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb6f591c4938b98b748e43625a54015486a6ed94
---
fftools/ffmpeg.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 855db934bf..6827899b90 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -3293,10 +3293,6 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
if (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO) {
if (!ost->frame_rate.num)
ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter);
- if (ist && !ost->frame_rate.num)
- ost->frame_rate = ist->framerate;
- if (ist && !ost->frame_rate.num)
- ost->frame_rate = ist->st->r_frame_rate;
if (ist && !ost->frame_rate.num && !ost->max_frame_rate.num) {
ost->frame_rate = (AVRational){25, 1};
av_log(NULL, AV_LOG_WARNING,
More information about the ffmpeg-cvslog
mailing list