projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[postprocessor/embedthumbnail] Skip embedding when there aren't any thumbnails
[youtube-dl]
/
youtube_dl
/
postprocessor
/
ffmpeg.py
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index c91ec8588ed5965cc13ecc95503e43aeb2ca081c..3ea1afcf31cb49e0992a79b46c5985bb33b742a3 100644
(file)
--- a/
youtube_dl/postprocessor/ffmpeg.py
+++ b/
youtube_dl/postprocessor/ffmpeg.py
@@
-44,7
+44,7
@@
ACODECS = {
'aac': 'aac',
'flac': 'flac',
'm4a': 'aac',
'aac': 'aac',
'flac': 'flac',
'm4a': 'aac',
- 'opus': 'opus',
+ 'opus': '
lib
opus',
'vorbis': 'libvorbis',
'wav': None,
}
'vorbis': 'libvorbis',
'wav': None,
}
@@
-444,7
+444,7
@@
class FFmpegMetadataPP(FFmpegPostProcessor):
chapters = info.get('chapters', [])
if chapters:
chapters = info.get('chapters', [])
if chapters:
- metadata_filename =
encodeFilename(replace_extension(filename, 'meta')
)
+ metadata_filename =
replace_extension(filename, 'meta'
)
with io.open(metadata_filename, 'wt', encoding='utf-8') as f:
def ffmpeg_escape(text):
return re.sub(r'(=|;|#|\\|\n)', r'\\\1', text)
with io.open(metadata_filename, 'wt', encoding='utf-8') as f:
def ffmpeg_escape(text):
return re.sub(r'(=|;|#|\\|\n)', r'\\\1', text)
@@
-542,7
+542,7
@@
class FFmpegFixupM3u8PP(FFmpegPostProcessor):
temp_filename = prepend_extension(filename, 'temp')
options = ['-c', 'copy', '-f', 'mp4', '-bsf:a', 'aac_adtstoasc']
temp_filename = prepend_extension(filename, 'temp')
options = ['-c', 'copy', '-f', 'mp4', '-bsf:a', 'aac_adtstoasc']
- self._downloader.to_screen('[ffmpeg] Fixing malform
ated aac
bitstream in "%s"' % filename)
+ self._downloader.to_screen('[ffmpeg] Fixing malform
ed AAC
bitstream in "%s"' % filename)
self.run_ffmpeg(filename, temp_filename, options)
os.remove(encodeFilename(filename))
self.run_ffmpeg(filename, temp_filename, options)
os.remove(encodeFilename(filename))
@@
-585,7
+585,7
@@
class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
dfxp_file = old_file
srt_file = subtitles_filename(filename, lang, 'srt')
dfxp_file = old_file
srt_file = subtitles_filename(filename, lang, 'srt')
- with
io.open(dfxp_file, 'rt', encoding='utf-8
') as f:
+ with
open(dfxp_file, 'rb
') as f:
srt_data = dfxp2srt(f.read())
with io.open(srt_file, 'wt', encoding='utf-8') as f:
srt_data = dfxp2srt(f.read())
with io.open(srt_file, 'wt', encoding='utf-8') as f: