Browse Source

Keep in sync with ffmpeg's current malformed AAC bitstream wording (closes #13587)

master-ytdl-org
Sergey M․ 8 years ago
parent
commit
a02682fd13
No known key found for this signature in database GPG Key ID: 2C393E0F18A9236D
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      youtube_dl/YoutubeDL.py
  2. +1
    -1
      youtube_dl/postprocessor/ffmpeg.py

+ 2
- 2
youtube_dl/YoutubeDL.py View File

@ -1890,7 +1890,7 @@ class YoutubeDL(object):
info_dict.get('protocol') == 'm3u8' and
self.params.get('hls_prefer_native')):
if fixup_policy == 'warn':
self.report_warning('%s: malformated aac bitstream.' % (
self.report_warning('%s: malformed AAC bitstream detected.' % (
info_dict['id']))
elif fixup_policy == 'detect_or_warn':
fixup_pp = FFmpegFixupM3u8PP(self)
@ -1899,7 +1899,7 @@ class YoutubeDL(object):
info_dict['__postprocessors'].append(fixup_pp)
else:
self.report_warning(
'%s: malformated aac bitstream. %s'
'%s: malformed AAC bitstream detected. %s'
% (info_dict['id'], INSTALL_FFMPEG_MESSAGE))
else:
assert fixup_policy in ('ignore', 'never')


+ 1
- 1
youtube_dl/postprocessor/ffmpeg.py View File

@ -542,7 +542,7 @@ class FFmpegFixupM3u8PP(FFmpegPostProcessor):
temp_filename = prepend_extension(filename, 'temp')
options = ['-c', 'copy', '-f', 'mp4', '-bsf:a', 'aac_adtstoasc']
self._downloader.to_screen('[ffmpeg] Fixing malformated aac bitstream in "%s"' % filename)
self._downloader.to_screen('[ffmpeg] Fixing malformed AAC bitstream in "%s"' % filename)
self.run_ffmpeg(filename, temp_filename, options)
os.remove(encodeFilename(filename))


Loading…
Cancel
Save