[common] Prefer the manifest than formats_dict in determining codecs

2016-01-30 21:42:27 +08:00
parent 5ea1eb78f5
commit df374b5222
1 changed files with 9 additions and 4 deletions
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -1376,10 +1376,15 @@ class InfoExtractor(object):
                        full_info.update(f)
                        codecs = r.attrib.get('codecs')
                        if codecs:
-                            if full_info.get('acodec') == 'none':
-                                full_info['vcodec'] = codecs
-                            elif full_info.get('vcodec') == 'none':
-                                full_info['acodec'] = codecs
+                            if mime_type.startswith('video/'):
+                                vcodec, acodec = codecs, 'none'
+                            else:  # mime_type.startswith('audio/')
+                                vcodec, acodec = 'none', codecs
+
+                            full_info.update({
+                                'vcodec': vcodec,
+                                'acodec': acodec,
+                            })
                        formats.append(full_info)
                    else:
                        existing_format.update(f)