summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-11-16 12:06:02 +0100
committerAnton Khirnov <anton@khirnov.net>2021-12-07 11:23:45 +0100
commitbb6f591c4938b98b748e43625a54015486a6ed94 (patch)
treebf0c90129aa7509adefcd524d444750cab11b7e5
parent6ebaccf327ce0fd88555fdd8b3f3deb019f0dc98 (diff)
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.
-rw-r--r--fftools/ffmpeg.c4
1 files changed, 0 insertions, 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,