Update and correct (format,extension) table for YouTube

[youtube-dl.git] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 8764acda0592df1c628b0a7d4dceeaa59d2b7394..9fe58a3547e37858ecc3c02482b7bf2c4654be79 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -561,7 +561,8 @@ class YoutubeIE(InfoExtractor):
 
                # Extension
                video_extension = {
 
                # Extension
                video_extension = {

-                       '17': '3gp',
+                       '13': '3gp',
+                       '17': 'mp4',

                        '18': 'mp4',
                        '22': 'mp4',
                }.get(format_param, 'flv')
                        '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
                """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.
 
                one has an extra field called "filepath" that points to the
                downloaded file.
 


@@ -997,7 +998,9 @@ if __name__ == '__main__':
                batchurls = []
                if opts.batchfile is not None:
                        try:
                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
                        except IOError:
                                sys.exit(u'ERROR: batch file could not be read')
                all_urls = batchurls + args