diff options
Diffstat (limited to 'youtube_dl/postprocessor/embedthumbnail.py')
| -rw-r--r-- | youtube_dl/postprocessor/embedthumbnail.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py index 4393c4e7a..795582259 100644 --- a/youtube_dl/postprocessor/embedthumbnail.py +++ b/youtube_dl/postprocessor/embedthumbnail.py @@ -55,11 +55,15 @@ class EmbedThumbnailPP(FFmpegPostProcessor): os.remove(encodeFilename(filename)) os.rename(encodeFilename(temp_filename), encodeFilename(filename)) +<<<<<<< HEAD elif info['ext'] == 'mkv': os.rename(encodeFilename(thumbnail_filename), encodeFilename('cover.jpg')) old_thumbnail_filename = thumbnail_filename thumbnail_filename = 'cover.jpg' +======= + if info['ext'] == 'mkv': +>>>>>>> a0b2ee64dbe6d4bedad9883cc8014aa77cdd0138 options = [ '-c', 'copy', '-attach', thumbnail_filename, '-metadata:s:t', 'mimetype=image/jpeg'] @@ -69,8 +73,11 @@ class EmbedThumbnailPP(FFmpegPostProcessor): if not self._already_have_thumbnail: os.remove(encodeFilename(thumbnail_filename)) +<<<<<<< HEAD else: os.rename(encodeFilename(thumbnail_filename), encodeFilename(old_thumbnail_filename)) +======= +>>>>>>> a0b2ee64dbe6d4bedad9883cc8014aa77cdd0138 os.remove(encodeFilename(filename)) os.rename(encodeFilename(temp_filename), encodeFilename(filename)) |