From: remitamine Date: Fri, 5 Feb 2016 16:12:49 +0000 (+0100) Subject: [ffmpeg] check for m3u8 protocol in FFmpegMetadataPP X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=7d3a035ee0a940021cb9c1a8cf0a8e5ab67f0c43 [ffmpeg] check for m3u8 protocol in FFmpegMetadataPP --- diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 7e85a702d..22d7ac65a 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -392,7 +392,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor): options.extend(['-metadata', '%s=%s' % (name, value)]) # https://github.com/rg3/youtube-dl/issues/8350 - if info.get('protocol') == 'm3u8_native' or self._downloader.params.get('hls_prefer_native', False): + if info.get('protocol') == 'm3u8_native' or info.get('protocol') == 'm3u8' and self._downloader.params.get('hls_prefer_native', False): options.extend(['-bsf:a', 'aac_adtstoasc']) self._downloader.to_screen('[ffmpeg] Adding metadata to \'%s\'' % filename)