]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[ffmpeg] check for m3u8 protocol in FFmpegMetadataPP
authorremitamine <remitamine@gmail.com>
Fri, 5 Feb 2016 16:12:49 +0000 (17:12 +0100)
committerremitamine <remitamine@gmail.com>
Fri, 5 Feb 2016 16:12:49 +0000 (17:12 +0100)
youtube_dl/postprocessor/ffmpeg.py

index 7e85a702d22180c015c768f563f41d498419d629..22d7ac65ac6fe6e0aedc4c91a101fb8272b9dd97 100644 (file)
@@ -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)