fix merge conflict

This commit is contained in:
Somdev Sangwan 2023-06-01 11:31:37 +05:30 committed by GitHub
parent 032e1babbb
commit 4a70a0dcaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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() 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: if "/" in output:
try: 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: except:
pass pass
return 30, 30 return 30, 30