aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/postprocessor
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl/postprocessor')
-rw-r--r--youtube_dl/postprocessor/common.py5
-rw-r--r--youtube_dl/postprocessor/ffmpeg.py8
2 files changed, 6 insertions, 7 deletions
diff --git a/youtube_dl/postprocessor/common.py b/youtube_dl/postprocessor/common.py
index c44501b59..bee64c457 100644
--- a/youtube_dl/postprocessor/common.py
+++ b/youtube_dl/postprocessor/common.py
@@ -1,7 +1,6 @@
from __future__ import unicode_literals
import os
-import shlex
from ..utils import (
PostProcessingError,
@@ -29,8 +28,8 @@ class PostProcessor(object):
_downloader = None
- def __init__(self, downloader=None, extra_cmd_args=None):
- self._extra_cmd_args = shlex.split(extra_cmd_args or '')
+ def __init__(self, downloader=None):
+ self._extra_cmd_args = downloader.params.get('postprocessor_args')
self._downloader = downloader
def set_downloader(self, downloader):
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index 891c72769..de8c225da 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -29,8 +29,8 @@ class FFmpegPostProcessorError(PostProcessingError):
class FFmpegPostProcessor(PostProcessor):
- def __init__(self, downloader=None, extra_cmd_args=None):
- PostProcessor.__init__(self, downloader, extra_cmd_args)
+ def __init__(self, downloader=None):
+ PostProcessor.__init__(self, downloader)
self._determine_executables()
def check_version(self):
@@ -287,8 +287,8 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
class FFmpegVideoConvertorPP(FFmpegPostProcessor):
- def __init__(self, downloader=None, preferedformat=None, extra_cmd_args=None):
- super(FFmpegVideoConvertorPP, self).__init__(downloader, extra_cmd_args)
+ def __init__(self, downloader=None, preferedformat=None):
+ super(FFmpegVideoConvertorPP, self).__init__(downloader)
self._preferedformat = preferedformat
def run(self, information):