schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master

Browse source
This commit is contained in:
Sergey M․ 2015-07-11 21:58:12 +06:00
commit ac9ed061ec
6 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
youtube_dl/postprocessor/ffmpeg.py
View file

@ -295,15 +295,20 @@ class FFmpegVideoConvertorPP(FFmpegPostProcessor):
def run(self, information):
path = information['filepath']
prefix, sep, ext = path.rpartition('.')
outpath = prefix + sep + self._preferedformat
ext = self._preferedformat
options = self._extra_cmd_args
if self._preferedformat == 'xvid':
ext = 'avi'
options.extend(['-c:v', 'libxvid', '-vtag', 'XVID'])
outpath = prefix + sep + ext
if information['ext'] == self._preferedformat:
self._downloader.to_screen('[ffmpeg] Not converting video file %s - already is in target format %s' % (path, self._preferedformat))
return [], information
self._downloader.to_screen('[' + 'ffmpeg' + '] Converting video from %s to %s, Destination: ' % (information['ext'], self._preferedformat) + outpath)
self.run_ffmpeg(path, outpath, [])
self.run_ffmpeg(path, outpath, options)
information['filepath'] = outpath
information['format'] = self._preferedformat
information['ext'] = self._preferedformat
information['ext'] = ext
return [path], information