From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 17 Feb 2015 16:27:29 +0000 (+0100)
Subject: [ffmpeg] Remove trivial helper method
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=65bf37ef83b67bd0e2c594283852d120734b2a3a;p=youtube-dl

[ffmpeg] Remove trivial helper method
---

diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index e98fe9834..3f2e6cf1d 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -37,7 +37,7 @@ class FFmpegPostProcessor(PostProcessor):
         if not self.available:
             raise FFmpegPostProcessorError('ffmpeg or avconv not found. Please install one.')
 
-        required_version = '10-0' if self._uses_avconv() else '1.0'
+        required_version = '10-0' if self.basename == 'avconv' else '1.0'
         if is_outdated_version(
                 self._versions[self.basename], required_version):
             warning = 'Your copy of %s is outdated, update %s to version %s or newer if you encounter any errors.' % (
@@ -112,9 +112,6 @@ class FFmpegPostProcessor(PostProcessor):
     def available(self):
         return self.basename is not None
 
-    def _uses_avconv(self):
-        return self.basename == 'avconv'
-
     @property
     def executable(self):
         return self._paths[self.basename]