pcmdec: move number of channels check to pcm_decode_init()

[ffmpeg] / avprobe.c

diff --git a/avprobe.c b/avprobe.c
index 5e83916f8779e614e715f420c8a9fdaeafebdf06..99ec1aa08e5f88dc44105059a6cd43429059e930 100644 (file)
--- a/avprobe.c
+++ b/avprobe.c
@@ -360,13 +360,11 @@ static void opt_input_file(void *optctx, const char *arg)
 
 static void show_help(void)
 {
-    const AVClass *class = avformat_get_class();
     av_log_set_callback(log_callback_help);
     show_usage();
     show_help_options(options, "Main options:\n", 0, 0);
     printf("\n");
-    av_opt_show2(&class, NULL,
-                 AV_OPT_FLAG_DECODING_PARAM, 0);
+    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 }
 
 static void opt_pretty(void)
@@ -399,6 +397,7 @@ int main(int argc, char **argv)
 {
     int ret;
 
+    parse_loglevel(argc, argv, options);
     av_register_all();
     init_opts();
 #if CONFIG_AVDEVICE