X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube-dl;h=9fe58a3547e37858ecc3c02482b7bf2c4654be79;hb=8d2c83eda50f07447ea93c73e17b9c5330106fbc;hp=a75af8af35806057582c362819479816c09a2960;hpb=27c3383e2d87257aaf25a08d1658e694ffc8c289;p=youtube-dl.git

diff --git a/youtube-dl b/youtube-dl
index a75af8af3..9fe58a354 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -561,7 +561,8 @@ class YoutubeIE(InfoExtractor):
 
 		# Extension
 		video_extension = {
-			'17': '3gp',
+			'13': '3gp',
+			'17': 'mp4',
 			'18': 'mp4',
 			'22': 'mp4',
 		}.get(format_param, 'flv')
@@ -919,7 +920,7 @@ class PostProcessor(object):
 		"""Run the PostProcessor.
 
 		The "information" argument is a dictionary like the ones
-		returned by InfoExtractors. The only difference is that this
+		composed by InfoExtractors. The only difference is that this
 		one has an extra field called "filepath" that points to the
 		downloaded file.
 
@@ -950,7 +951,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 				usage='Usage: %prog [options] url...',
-				version='2009.04.25',
+				version='INTERNAL',
 				conflict_handler='resolve',
 				)
 		parser.add_option('-h', '--help',
@@ -997,7 +998,9 @@ if __name__ == '__main__':
 		batchurls = []
 		if opts.batchfile is not None:
 			try:
-				batchurls = [line.strip() for line in open(opts.batchfile, 'r')]
+				batchurls = open(opts.batchfile, 'r').readlines()
+				batchurls = [x.strip() for x in batchurls]
+				batchurls = [x for x in batchurls if len(x) > 0]
 			except IOError:
 				sys.exit(u'ERROR: batch file could not be read')
 		all_urls = batchurls + args