diff options
author | Pierre Rudloff <contact@rudloff.pro> | 2013-08-31 00:37:29 +0200 |
---|---|---|
committer | Pierre Rudloff <contact@rudloff.pro> | 2013-08-31 00:37:29 +0200 |
commit | 847f582290c6ad6ec0c72760ea3cfa6417d28e3c (patch) | |
tree | c12baa61c649ec00e5fdfe35b1f88f0025d54f99 /youtube_dl/PostProcessor.py | |
parent | cd9c100963e8b8bf651d1f359e5f7812603ca0fd (diff) | |
parent | 10f5c016ec6262e5d29327e97fe4f3d1127ccdff (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/PostProcessor.py')
-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) |