X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fted.py;h=cf8851438bb74000abb2692c34607f3137505f1d;hb=64f08d4ff2392135be07774f2d5371f111f21592;hp=e2cbbc121b97d439479140efe1aa4ce1e49bb98d;hpb=cfbee8a431fdc22ff98dc115a59e0a48cace2c0e;p=youtube-dl

diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py
index e2cbbc121..cf8851438 100644
--- a/youtube_dl/extractor/ted.py
+++ b/youtube_dl/extractor/ted.py
@@ -73,7 +73,7 @@ class TEDIE(InfoExtractor):
         'add_ie': ['Youtube'],
         'info_dict': {
             'id': '_ZG8HBuDjgc',
-            'ext': 'mp4',
+            'ext': 'webm',
             'title': 'Douglas Adams: Parrots the Universe and Everything',
             'description': 'md5:01ad1e199c49ac640cb1196c0e9016af',
             'uploader': 'University of California Television (UCTV)',
@@ -198,7 +198,12 @@ class TEDIE(InfoExtractor):
                 hls_formats = self._extract_m3u8_formats(
                     resources.get('stream'), video_name, 'mp4', m3u8_id=format_id)
                 for f in hls_formats:
-                    f['acodec'] = 'none'
+                    if f.get('format_id') == 'hls-meta':
+                        continue
+                    if not f.get('height'):
+                        f['vcodec'] = 'none'
+                    else:
+                        f['acodec'] = 'none'
                 formats.extend(hls_formats)
 
         audio_download = talk_info.get('audioDownload')
@@ -207,6 +212,7 @@ class TEDIE(InfoExtractor):
                 'url': audio_download,
                 'format_id': 'audio',
                 'vcodec': 'none',
+                'preference': -0.5,
             })
 
         self._sort_formats(formats)