Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
  avconv: print info/capabilities options in a separate help group.
  avtools: add -h demuxer/muxer
  cmdutils: extend -h to allow printing codec details.

Conflicts:
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 2 deletions

diff --git a/ffprobe.c b/ffprobe.c
index 2046ec0f34..c1a90de692 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -2072,7 +2072,7 @@ static void opt_input_file(void *optctx, const char *arg)
     input_filename = arg;
 }
 
-static int show_help(const char *opt, const char *arg)
+void show_help_default(const char *opt, const char *arg)
 {
     av_log_set_callback(log_callback_help);
     show_usage();
@@ -2080,7 +2080,6 @@ static int show_help(const char *opt, const char *arg)
     printf("\n");
 
     show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
-    return 0;
 }
 
 static int opt_pretty(const char *opt, const char *arg)