diff options
| author | pulpe <Pulpan3@gmail.com> | 2014-02-22 18:10:07 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-03-26 15:22:52 +0100 |
| commit | 149254d0d5fd9407a008e31c2e4362316e625d35 (patch) | |
| tree | e9c5155f8aca58255f1af2feaac92e54eca79b68 /youtube_dl | |
| parent | 0c14e2fbe3c5cba16af27525aa6715819226e6d8 (diff) | |
fix ffmpeg error, if youtube-dl runs more than once with --embed-thumbnail with same video
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/__init__.py | 4 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/__init__.py | 4 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 490f76dc9..8b95a6d9b 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -91,7 +91,7 @@ from .version import __version__ from .YoutubeDL import YoutubeDL from .postprocessor import ( AtomicParsleyPP, - FFmpegMediaFixPP, + FFmpegAudioFixPP, FFmpegMetadataPP, FFmpegVideoConvertor, FFmpegExtractAudioPP, @@ -808,7 +808,7 @@ def _real_main(argv=None): if opts.xattrs: ydl.add_post_processor(XAttrMetadataPP()) if opts.embedthumbnail: - ydl.add_post_processor(FFmpegMediaFixPP()) + ydl.add_post_processor(FFmpegAudioFixPP()) ydl.add_post_processor(AtomicParsleyPP()) # Update version diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py index 9410dcf5b..08e6ddd00 100644 --- a/youtube_dl/postprocessor/__init__.py +++ b/youtube_dl/postprocessor/__init__.py @@ -1,7 +1,7 @@ from .atomicparsley import AtomicParsleyPP from .ffmpeg import ( - FFmpegMediaFixPP, + FFmpegAudioFixPP, FFmpegMergerPP, FFmpegMetadataPP, FFmpegVideoConvertor, @@ -12,7 +12,7 @@ from .xattrpp import XAttrMetadataPP __all__ = [ 'AtomicParsleyPP', - 'FFmpegMediaFixPP', + 'FFmpegAudioFixPP', 'FFmpegMergerPP', 'FFmpegMetadataPP', 'FFmpegVideoConvertor', diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 26a70491a..75ee87e1a 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -484,13 +484,13 @@ class FFmpegMergerPP(FFmpegPostProcessor): return True, info -class FFmpegMediaFixPP(FFmpegPostProcessor): +class FFmpegAudioFixPP(FFmpegPostProcessor): def run(self, info): filename = info['filepath'] temp_filename = prepend_extension(filename, 'temp') - options = ['-vcodec', 'copy', '-acodec', 'copy'] - self._downloader.to_screen(u'[ffmpeg] Fixing media file "%s"' % filename) + options = ['-vn', '-acodec', 'copy'] + self._downloader.to_screen(u'[ffmpeg] Fixing audio file "%s"' % filename) self.run_ffmpeg(filename, temp_filename, options) os.remove(encodeFilename(filename)) |