X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Foptions.py;h=0d2ce8d1506e9acaa3fd2f13a001793257dac68f;hb=04a3d4d23472ffa4a482d8ebf2d8fdbb3e974327;hp=0eb4924b6fe04582b85053dc65f69e7fa3d42a51;hpb=b6ee45e9fada3b1179e7e549ebf1dd8ad0bbca7c;p=youtube-dl

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 0eb4924b6..0d2ce8d15 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -751,7 +751,7 @@ def parseOpts(overrideArguments=None):
         help='Convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe)')
     postproc.add_option(
         '--audio-format', metavar='FORMAT', dest='audioformat', default='best',
-        help='Specify audio format: "best", "aac", "vorbis", "mp3", "m4a", "opus", or "wav"; "%default" by default')
+        help='Specify audio format: "best", "aac", "vorbis", "mp3", "m4a", "opus", or "wav"; "%default" by default; No effect without -x')
     postproc.add_option(
         '--audio-quality', metavar='QUALITY',
         dest='audioquality', default='5',
@@ -867,7 +867,7 @@ def parseOpts(overrideArguments=None):
             if '--ignore-config' not in system_conf:
                 user_conf = _readUserConf()
 
-        argv = system_conf + user_conf + command_line_conf
+        argv = system_conf + user_conf + custom_conf + command_line_conf
         opts, args = parser.parse_args(argv)
         if opts.verbose:
             for conf_label, conf in (