From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sun, 14 Jul 2013 15:31:52 +0000 (+0200)
Subject: Fix the default values of format_id and format
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=8016c9229718080f5211b9f9da176992622b30e6

Fix the default values of format_id and format
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index e159aa336..a32e50772 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -472,10 +472,10 @@ class YoutubeDL(object):
                     else:
                         format_desc = u'%sp' % format['height']
                 else:
-                    format_desc = compat_str(i)
+                    format_desc = '???'
                 format['format'] = format_desc
             if format.get('format_id') is None:
-                format['format_id'] = '???'
+                format['format_id'] = compat_str(i)
 
         if self.params.get('listformats', None):
             self.list_formats(info_dict)