X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube-dl;h=ea4b3fded85fb0529d38e75e2ef500da20b28b15;hb=ca6a11fa59aad97e861442045032e585eceabf1a;hp=514f71aa643883a333694b561adae42118162db2;hpb=896a6ea9e2a695f3a2aa116ce6d561071f3c61cd;p=youtube-dl.git diff --git a/youtube-dl b/youtube-dl index 514f71aa6..ea4b3fded 100755 --- a/youtube-dl +++ b/youtube-dl @@ -99,7 +99,7 @@ def sanitize_open(filename, open_mode): return (stream, filename) except (IOError, OSError), err: # In case of error, try to remove win32 forbidden chars - filename = re.sub(ur'[<>:"\|\?\*]', u'#', filename) + filename = re.sub(ur'[/<>:"\|\?\*]', u'#', filename) # An exception here should be caught in the caller stream = open(filename, open_mode) @@ -691,6 +691,8 @@ class YoutubeIE(InfoExtractor): '18': 'mp4', '22': 'mp4', '37': 'mp4', + '43': 'webm', + '45': 'webm', } @staticmethod @@ -1985,7 +1987,7 @@ if __name__ == '__main__': # Parse command line parser = optparse.OptionParser( usage='Usage: %prog [options] url...', - version='2010.04.04', + version='2010.06.06', conflict_handler='resolve', )