Merge branch 'master' into linux

LINUX FFMPEG 7.0 Compatible
2025-02-28 09:31:07 +08:00 · 2025-01-19 14:57:24 +08:00 · 2025-01-13 12:47:30 +08:00 · 2025-01-13 12:36:13 +08:00
1 changed files with 2 additions and 2 deletions
--- a/entity/ffmpeg.py
+++ b/entity/ffmpeg.py
@ -168,7 +168,7 @@ class FfmpegTask(object):
                input_index = input_args.count("-i")
                input_args.append("-i")
                input_args.append(overlay)
-                filter_args.append(f"{video_output_str}[{input_index}:v]scale=rw:rh[v]")
+                filter_args.append(f"{video_output_str}[{input_index}:v]scale2ref=main_w:main_h[v]")
                filter_args.append(f"[v][{input_index}:v]overlay=1:eof_action=endall[v]")
                video_output_str = "[v]"
            for subtitle in self.subtitles:
Author	SHA1	Message	Date
Jerry Yan	6f3e953dd4	Merge branch 'master' into linux	2025-02-28 09:31:07 +08:00
Jerry Yan	3f7475e270	Merge branch 'master' into linux	2025-01-19 14:57:24 +08:00
Jerry Yan (Server)	03b4434c36	LINUX FFMPEG 7.0 Compatible	2025-01-13 12:47:30 +08:00
Jerry Yan	bc13578156	Linux-Ffmpeg7.0	2025-01-13 12:36:13 +08:00