From: Yen Chi Hsuan Date: Sat, 30 Jan 2016 13:42:27 +0000 (+0800) Subject: [common] Prefer the manifest than formats_dict in determining codecs X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=df374b52228e8a083d045f9bc56847e418ef452e;p=youtube-dl [common] Prefer the manifest than formats_dict in determining codecs --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 243db71dc..f1313ef04 100644 --- 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)