diff options
| author | MrDoritos <ianmoore322@gmail.com> | 2020-03-20 18:06:42 -0400 |
|---|---|---|
| committer | MrDoritos <ianmoore322@gmail.com> | 2020-03-20 18:06:42 -0400 |
| commit | 50d8b605290be2b7522e4b262a5822bdb753d994 (patch) | |
| tree | 5d25d20af2f15062727971281f410f054b0c1b31 /youtube_dl/postprocessor/embedthumbnail.py | |
| parent | 8c9686906d023fdbc32b29ce8156f6193eead0a0 (diff) | |
| download | hypervideo-pre-50d8b605290be2b7522e4b262a5822bdb753d994.tar.lz hypervideo-pre-50d8b605290be2b7522e4b262a5822bdb753d994.tar.xz hypervideo-pre-50d8b605290be2b7522e4b262a5822bdb753d994.zip | |
[MKV Thumbnail Support] Now has the correct file name in MKV container
Diffstat (limited to 'youtube_dl/postprocessor/embedthumbnail.py')
| -rw-r--r-- | youtube_dl/postprocessor/embedthumbnail.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py index 795582259..4393c4e7a 100644 --- a/youtube_dl/postprocessor/embedthumbnail.py +++ b/youtube_dl/postprocessor/embedthumbnail.py @@ -55,15 +55,11 @@ 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'] @@ -73,11 +69,8 @@ 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)) |