mirror of
https://github.com/joshuaboniface/rffmpeg.git
synced 2026-01-23 02:24:03 +00:00
Revert "Remove bad workaround with stdout"
This reverts commit 750461620e.
This commit is contained in:
parent
750461620e
commit
6a62ae4c83
1 changed files with 9 additions and 1 deletions
10
rffmpeg.py
10
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.stdout)
|
||||
stdout=stdout)
|
||||
|
||||
###############################################################################
|
||||
# Cleanup
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue