youtube-dl

commit: 4bc60dafebb34fc8a403b57818bb2f1660218818
parent bf5b0a1bfb3d875cb3ccd2fc834efd7343885bd2
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Thu, 26 Dec 2013 21:05:30 +0100

[blinkx] Use centralized format sorting

Diffstat:
M
youtube_dl/extractor/blinkx.py
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/blinkx.py b/youtube_dl/extractor/blinkx.py
@@ -61,9 +61,10 @@ class BlinkxIE(InfoExtractor):
             elif m['type'] in ('flv', 'mp4'):
                 vcodec = remove_start(m['vcodec'], 'ff')
                 acodec = remove_start(m['acodec'], 'ff')
+                tbr = (int(m['vbr']) + int(m['abr'])) // 1000
                 format_id = (u'%s-%sk-%s' %
                              (vcodec,
-                              (int(m['vbr']) + int(m['abr'])) // 1000,
+                              tbr,
                               m['w']))
                 formats.append({
                     'format_id': format_id,
@@ -72,10 +73,12 @@ class BlinkxIE(InfoExtractor):
                     'acodec': acodec,
                     'abr': int(m['abr']) // 1000,
                     'vbr': int(m['vbr']) // 1000,
+                    'tbr': tbr,
                     'width': int(m['w']),
                     'height': int(m['h']),
                 })
-        formats.sort(key=lambda f: (f['width'], f['vbr'], f['abr']))
+
+        self._sort_formats(formats)
 
         return {
             'id': display_id,