From 022334e1e91cc974d98973c21378c83991329663 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 5 Feb 2020 20:16:09 -0500 Subject: [PATCH] Fix stdout/stderr when running -version --- rffmpeg.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rffmpeg.py b/rffmpeg.py index 0c4f7bf..a7561db 100755 --- a/rffmpeg.py +++ b/rffmpeg.py @@ -173,6 +173,14 @@ if all_args[0] == 'ffprobe': else: rffmpeg_command.append(config['ffmpeg_command']) +# Determine if "-version" is an argument; if so, we output stdout to stdout, +# otherwise we output it to stderr +# Weird workaround for something Jellyfin requires... +if '-version' in cli_ffmpeg_args: + stdout = sys.stdout +else: + stdout = sys.stderr + # Parse and re-quote the arguments for arg in cli_ffmpeg_args: if arg[0] != '-': @@ -192,7 +200,7 @@ p = subprocess.run(rffmpeg_command, universal_newlines=True, stdin=sys.stdin, stderr=sys.stderr, - stdout=sys.stderr) + stdout=stdout) ############################################################################### # Cleanup