From 46a1f51a8f8c0bd308d69ea32e4e63082c656a9f Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 26 Mar 2016 16:56:08 +0100 Subject: [PATCH] [ffmpeg] fix #1009 --- src/you_get/processor/ffmpeg.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py index 7262c462..e4ea1223 100644 --- a/src/you_get/processor/ffmpeg.py +++ b/src/you_get/processor/ffmpeg.py @@ -2,6 +2,7 @@ import os.path import subprocess +from ..util.strings import parameterize def get_usable_ffmpeg(cmd): try: @@ -53,7 +54,7 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'): concat_list = open(output + '.txt', 'w', encoding="utf-8") for file in files: if os.path.isfile(file): - concat_list.write("file '%s'\n" % file) + concat_list.write("file %s\n" % parameterize(file)) concat_list.close() params = [FFMPEG] + LOGLEVEL @@ -118,7 +119,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'): if os.path.isfile(file): # for escaping rules, see: # https://www.ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping - concat_list.write("file '%s'\n" % file.replace("'", r"'\''")) + concat_list.write("file %s\n" % parameterize(file)) concat_list.close() params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i'] @@ -163,7 +164,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'): concat_list = open(output + '.txt', 'w', encoding="utf-8") for file in files: if os.path.isfile(file): - concat_list.write("file '%s'\n" % file) + concat_list.write("file %s\n" % parameterize(file)) concat_list.close() params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i']