ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Thu Sep 12 18:09:58 2024 +0200| [ac578ccb8ec47c9175f1b1020058e5f0141c5527] | committer: Anton Khirnov
fftools/ffmpeg_filter: drop a redundant check OutputFilterOptions.frame_rates are always NULL if the conditional is true. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac578ccb8ec47c9175f1b1020058e5f0141c5527 --- fftools/ffmpeg_filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 9ffbb8fbf4..63462300f9 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -856,8 +856,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->fps.vsync_method = opts->vsync_method; ofp->fps.framerate = ost->frame_rate; ofp->fps.framerate_max = ost->max_frame_rate; - ofp->fps.framerate_supported = ost->force_fps || !opts->enc ? - NULL : opts->frame_rates; + ofp->fps.framerate_supported = opts->frame_rates; // reduce frame rate for mpeg4 to be within the spec limits if (opts->enc && opts->enc->id == AV_CODEC_ID_MPEG4) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
