[FFmpeg-cvslog] fftools/ffmpeg_filter: configure min_hard_comp unconditionally

Zhao Zhili git at videolan.org
Fri Sep 23 09:34:31 EEST 2022


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Sat Sep 17 12:30:01 2022 +0800| [686096739b129c7e3ea26be29c875e0887e58c49] | committer: Zhao Zhili

fftools/ffmpeg_filter: configure min_hard_comp unconditionally

There are two issues here. Firstly, the floating-point comparison
is always true. Seconly, the code depends on the default value of
min_hard_comp implicitly, which can be dangerous.

Partially fixes ticket 9859.

Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>

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

 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 7a5308425d..17928cea2c 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -896,8 +896,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
         char args[256] = {0};
 
         av_strlcatf(args, sizeof(args), "async=%d", audio_sync_method);
-        if (audio_drift_threshold != 0.1)
-            av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold);
+        av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold);
         if (!fg->reconfiguration)
             av_strlcatf(args, sizeof(args), ":first_pts=0");
         AUTO_INSERT_FILTER_INPUT("-async", "aresample", args);



More information about the ffmpeg-cvslog mailing list