Merge remote-tracking branch 'origin/master'

This commit is contained in:
Philipp Hagemeister 2014-01-01 15:30:46 +01:00
commit eadaf08c16
6 changed files with 48 additions and 5 deletions

View file

@ -1017,7 +1017,7 @@ class YoutubeDL(object):
def list_formats(self, info_dict):
def format_note(fdict):
res = u''
if f.get('ext') in ['f4f', 'f4m']:
if fdict.get('ext') in ['f4f', 'f4m']:
res += u'(unsupported) '
if fdict.get('format_note') is not None:
res += fdict['format_note'] + u' '