X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=08afab4f801e4d84c86e6285bada64a53c241d8e;hb=43f35682e9cf509459097e6fdebe2f10c95094f1;hp=91ee099ceab577fb1514eaa52e633fbca9fa2306;hpb=1c76e23e0fca5e16a1fc4f0baca58503ba7ec639;p=youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 91ee099ce..08afab4f8 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -260,7 +260,9 @@ class FileDownloader(object):
 			return
 
 		try:
-			filename = self.params['outtmpl'] % info_dict
+			template_dict = dict(info_dict)
+			template_dict['epoch'] = unicode(long(time.time()))
+			filename = self.params['outtmpl'] % template_dict
 			self.report_destination(filename)
 		except (ValueError, KeyError), err:
 			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
@@ -433,7 +435,7 @@ class YoutubeIE(InfoExtractor):
 	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
 	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
 	_NETRC_MACHINE = 'youtube'
-	_available_formats = ['22', '18', '17', '13'] # listed in order of priority for -b flag
+	_available_formats = ['22', '35', '18', '17', '13'] # listed in order of priority for -b flag
 	_video_extensions = {
 		'13': '3gp',
 		'17': 'mp4',
@@ -994,7 +996,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 			usage='Usage: %prog [options] url...',
-			version='INTERNAL',
+			version='2009.05.11',
 			conflict_handler='resolve',
 		)