Merge remote-tracking branch 'origin/master'
This commit is contained in:
		@@ -137,7 +137,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
 | 
				
			|||||||
        try:
 | 
					        try:
 | 
				
			||||||
            FFmpegPostProcessor.run_ffmpeg(self, path, out_path, opts)
 | 
					            FFmpegPostProcessor.run_ffmpeg(self, path, out_path, opts)
 | 
				
			||||||
        except FFmpegPostProcessorError as err:
 | 
					        except FFmpegPostProcessorError as err:
 | 
				
			||||||
            raise AudioConversionError(err.message)
 | 
					            raise AudioConversionError(err.msg)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def run(self, information):
 | 
					    def run(self, information):
 | 
				
			||||||
        path = information['filepath']
 | 
					        path = information['filepath']
 | 
				
			||||||
@@ -207,7 +207,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
 | 
				
			|||||||
        except:
 | 
					        except:
 | 
				
			||||||
            etype,e,tb = sys.exc_info()
 | 
					            etype,e,tb = sys.exc_info()
 | 
				
			||||||
            if isinstance(e, AudioConversionError):
 | 
					            if isinstance(e, AudioConversionError):
 | 
				
			||||||
                msg = u'audio conversion failed: ' + e.message
 | 
					                msg = u'audio conversion failed: ' + e.msg
 | 
				
			||||||
            else:
 | 
					            else:
 | 
				
			||||||
                msg = u'error running ' + (self._exes['avconv'] and 'avconv' or 'ffmpeg')
 | 
					                msg = u'error running ' + (self._exes['avconv'] and 'avconv' or 'ffmpeg')
 | 
				
			||||||
            raise PostProcessingError(msg)
 | 
					            raise PostProcessingError(msg)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user