From 7baed6e4f27a9af571aea2db07e9b15eccf1cbb8 Mon Sep 17 00:00:00 2001 From: RasmusMathiesen Date: Mon, 27 Jan 2020 21:22:50 +0100 Subject: [PATCH 1/3] Protect fixup postprocessors from user configuration --- youtube_dl/postprocessor/ffmpeg.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index fd3f921a8..6f68f63f0 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -549,6 +549,9 @@ class FFmpegFixupStretchedPP(FFmpegPostProcessor): return [], info + def _configuration_args(self, default=[]): + return [] # Make sure the users extra arguments don't mess up the fix + class FFmpegFixupM4aPP(FFmpegPostProcessor): def run(self, info): @@ -567,6 +570,8 @@ class FFmpegFixupM4aPP(FFmpegPostProcessor): return [], info + def _configuration_args(self, default=[]): + return [] # Make sure the users extra arguments don't mess up the fix class FFmpegFixupM3u8PP(FFmpegPostProcessor): def run(self, info): @@ -581,6 +586,9 @@ class FFmpegFixupM3u8PP(FFmpegPostProcessor): os.remove(encodeFilename(filename)) os.rename(encodeFilename(temp_filename), encodeFilename(filename)) return [], info + + def _configuration_args(self, default=[]): + return [] # Make sure the users extra arguments don't mess up the fix class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor): From 79c634dfe01322347eafa2b039bf4fafc91201a6 Mon Sep 17 00:00:00 2001 From: RasmusMathiesen Date: Mon, 27 Jan 2020 21:29:45 +0100 Subject: [PATCH 2/3] Update ffmpeg.py --- youtube_dl/postprocessor/ffmpeg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 6f68f63f0..536870257 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -550,7 +550,7 @@ class FFmpegFixupStretchedPP(FFmpegPostProcessor): return [], info def _configuration_args(self, default=[]): - return [] # Make sure the users extra arguments don't mess up the fix + return [] # Make sure the users extra arguments don't mess up the fix class FFmpegFixupM4aPP(FFmpegPostProcessor): @@ -571,7 +571,7 @@ class FFmpegFixupM4aPP(FFmpegPostProcessor): return [], info def _configuration_args(self, default=[]): - return [] # Make sure the users extra arguments don't mess up the fix + return [] # Make sure the users extra arguments don't mess up the fix class FFmpegFixupM3u8PP(FFmpegPostProcessor): def run(self, info): @@ -588,7 +588,7 @@ class FFmpegFixupM3u8PP(FFmpegPostProcessor): return [], info def _configuration_args(self, default=[]): - return [] # Make sure the users extra arguments don't mess up the fix + return [] # Make sure the users extra arguments don't mess up the fix class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor): From ab7c023ccd057b1e1d047dceded4eb9c87a25269 Mon Sep 17 00:00:00 2001 From: RasmusMathiesen Date: Mon, 27 Jan 2020 22:00:06 +0100 Subject: [PATCH 3/3] Fix whitespace --- youtube_dl/postprocessor/ffmpeg.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 536870257..e57a01665 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -551,7 +551,7 @@ class FFmpegFixupStretchedPP(FFmpegPostProcessor): def _configuration_args(self, default=[]): return [] # Make sure the users extra arguments don't mess up the fix - + class FFmpegFixupM4aPP(FFmpegPostProcessor): def run(self, info): @@ -573,6 +573,7 @@ class FFmpegFixupM4aPP(FFmpegPostProcessor): def _configuration_args(self, default=[]): return [] # Make sure the users extra arguments don't mess up the fix + class FFmpegFixupM3u8PP(FFmpegPostProcessor): def run(self, info): filename = info['filepath'] @@ -586,7 +587,7 @@ class FFmpegFixupM3u8PP(FFmpegPostProcessor): os.remove(encodeFilename(filename)) os.rename(encodeFilename(temp_filename), encodeFilename(filename)) return [], info - + def _configuration_args(self, default=[]): return [] # Make sure the users extra arguments don't mess up the fix