diff options
| author | Philipp Hagemeister <[email protected]> | 2013-08-28 14:02:40 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <[email protected]> | 2013-08-28 14:02:40 +0200 |
| commit | ccf4b799df0f97df5f745f38af96666386766754 (patch) | |
| tree | e28265b3ba1af9ce2d8b5fe5eea86ef1a57a546e | |
| parent | f143d86ad2fc0633d8e2da598cf21e73ff0f2872 (diff) | |
| parent | 8ae97d76eee1bf9e9098797db3be2d7b816196b2 (diff) | |
| download | youtube-dl-ccf4b799df0f97df5f745f38af96666386766754.tar.gz youtube-dl-ccf4b799df0f97df5f745f38af96666386766754.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | youtube_dl/PostProcessor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index c02ed7148..ae56d2082 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -137,7 +137,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): try: FFmpegPostProcessor.run_ffmpeg(self, path, out_path, opts) except FFmpegPostProcessorError as err: - raise AudioConversionError(err.message) + raise AudioConversionError(err.msg) def run(self, information): path = information['filepath'] @@ -207,7 +207,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): except: etype,e,tb = sys.exc_info() if isinstance(e, AudioConversionError): - msg = u'audio conversion failed: ' + e.message + msg = u'audio conversion failed: ' + e.msg else: msg = u'error running ' + (self._exes['avconv'] and 'avconv' or 'ffmpeg') raise PostProcessingError(msg) |