From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sat, 13 Jul 2013 16:19:37 +0000 (+0200)
Subject: Default 'format' field to {width}x{height}
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=79819f58f2328cdb08272c55d01965cd8c6624ba;p=youtube-dl

Default 'format' field to {width}x{height}

If width is None, use {height}p and if height is None, '???'
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index c6235abd3..829a70ec9 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -466,9 +466,16 @@ class YoutubeDL(object):
         # We check that all the formats have the format and format_id fields
         for (i, format) in enumerate(formats):
             if format.get('format') is None:
-                format['format'] = compat_str(i)
+                if format.get('height') is not None:
+                    if format.get('width') is not None:
+                        format_desc = u'%sx%s' % (format['width'], format['height'])
+                    else:
+                        format_desc = u'%sp' % format['height']
+                else:
+                    format_desc = compat_str(i)
+                format['format'] = format_desc
             if format.get('format_id') is None:
-                format['format_id'] = compat_str(i)
+                format['format_id'] = '???'
 
         if self.params.get('listformats', None):
             self.list_formats(info_dict)