fix merge conflict

2023-06-01 11:31:37 +05:30 · 2023-06-01 11:31:37 +05:30 · 4a70a0dcaa
commit 4a70a0dcaa
parent 032e1babbb
1 changed files with 1 additions and 1 deletions
--- a/core/utils.py
+++ b/core/utils.py
@ -23,7 +23,7 @@ def detect_fps(input_path):
    output = os.popen(f'ffprobe -v error -select_streams v -of default=noprint_wrappers=1:nokey=1 -show_entries stream=r_frame_rate "{input_path}"').read()
    if "/" in output:
        try:
-            return int(output.split("/")[0]) // int(output.split("/")[1]), output.removesuffix('\n')
+            return int(output.split("/")[0]) // int(output.split("/")[1].strip()), output.strip()
        except:
            pass
    return 30, 30