From dd2ce9112b2ba3dbd55f357844789b308daa310c Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Fri, 31 May 2019 13:23:40 +1200 Subject: [PATCH] Clean-up fall-back for ffmpeg not accepting show error --- core/transcoder.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/transcoder.py b/core/transcoder.py index 014f84c3..e1850de2 100644 --- a/core/transcoder.py +++ b/core/transcoder.py @@ -109,12 +109,11 @@ def get_video_details(videofile, img=None, bitbucket=None): result = proc.returncode video_details = json.loads(out.decode()) except Exception: - pass - if not video_details: - try: + try: # try this again without -show error in case of ffmpeg limitation command = [core.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', videofile] + print_cmd(command) if img: - procin = zip_out(file, img) + procin = zip_out(file, img, bitbucket) proc = subprocess.Popen(command, stdout=subprocess.PIPE, stdin=procin.stdout) procin.stdout.close() else: