aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/postprocessor
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2016-02-05 17:12:49 +0100
committerremitamine <remitamine@gmail.com>2016-02-05 17:12:49 +0100
commit7d3a035ee0a940021cb9c1a8cf0a8e5ab67f0c43 (patch)
tree7683dfc22aac7d8f3cc750618b1d11924eb58c73 /youtube_dl/postprocessor
parente06e75c7e7794c759077f2bb462dcf5d94a21760 (diff)
downloadyoutube-dl-7d3a035ee0a940021cb9c1a8cf0a8e5ab67f0c43.tar.xz
[ffmpeg] check for m3u8 protocol in FFmpegMetadataPP
Diffstat (limited to 'youtube_dl/postprocessor')
-rw-r--r--youtube_dl/postprocessor/ffmpeg.py2
1 files changed, 1 insertions, 1 deletions
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)