ffmpeg | branch: master | Anton Khirnov <[email protected]> | Wed Nov 16 
15:33:26 2022 +0100| [50ecba7e8474966517cdd28c4ce9d9258e9b14e6] | committer: 
Anton Khirnov

fftools/ffmpeg: drop an arbitrary condition

Encoding init code will currently fall back to a 25fps default when no
framerate is known or specified, but only if there is a known source
input stream. There is no good reason for this condition, so drop it.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50ecba7e8474966517cdd28c4ce9d9258e9b14e6
---

 fftools/ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 25155e155e..2c4dc83f03 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2877,7 +2877,7 @@ 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->max_frame_rate.num) {
+        if (!ost->frame_rate.num && !ost->max_frame_rate.num) {
             ost->frame_rate = (AVRational){25, 1};
             av_log(NULL, AV_LOG_WARNING,
                    "No information "

_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".

Reply via email to