X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Foptions.py;h=c9033e3cb230e4019b49c0fa6903ce1e8c65d556;hb=1b734adb2d3bb17af67b5fef933a6fafe71e4cf4;hp=14051b7143d3003098d59b40362116447c156a3e;hpb=8ec2b2c41c7f3952ad9097085993d1f24f6b6776;p=youtube-dl.git

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 14051b714..c9033e3cb 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -26,9 +26,7 @@ def parseOpts(overrideArguments=None):
         except IOError:
             return default  # silently skip if file is not present
         try:
-            res = []
-            for l in optionf:
-                res += compat_shlex_split(l, comments=True)
+            res = compat_shlex_split(optionf.read(), comments=True)
         finally:
             optionf.close()
         return res
@@ -668,7 +666,7 @@ def parseOpts(overrideArguments=None):
         action='store_true', dest='writeannotations', default=False,
         help='Write video annotations to a .annotations.xml file')
     filesystem.add_option(
-        '--load-info',
+        '--load-info-json', '--load-info',
         dest='load_info_filename', metavar='FILE',
         help='JSON file containing the video information (created with the "--write-info-json" option)')
     filesystem.add_option(