From: remitamine <remitamine@gmail.com>
Date: Tue, 15 Mar 2016 17:39:50 +0000 (+0100)
Subject: Merge pull request #8513 from remitamine/dash-sort
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=49dea4913bea3b8e5c7d65dd932aa68ada526088;hp=dec2cae0a768d2eb1f7d28cfd267d0bf5383bcdd;p=youtube-dl

Merge pull request #8513 from remitamine/dash-sort

[extractor/common] fix dash formats sorting
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index ecd7da767..770105a5b 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -862,6 +862,7 @@ class InfoExtractor(object):
             proto_preference = 0 if determine_protocol(f) in ['http', 'https'] else -0.1
 
             if f.get('vcodec') == 'none':  # audio only
+                preference -= 50
                 if self._downloader.params.get('prefer_free_formats'):
                     ORDER = ['aac', 'mp3', 'm4a', 'webm', 'ogg', 'opus']
                 else:
@@ -872,6 +873,8 @@ class InfoExtractor(object):
                 except ValueError:
                     audio_ext_preference = -1
             else:
+                if f.get('acodec') == 'none':  # video only
+                    preference -= 40
                 if self._downloader.params.get('prefer_free_formats'):
                     ORDER = ['flv', 'mp4', 'webm']
                 else: