From 70026be8e52460776f8023f35cdad3e854e752ae Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 25 May 2012 15:19:50 -0700 Subject: avprobe: fix function prototype Make opt_output_format return the correct value. --- avprobe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'avprobe.c') diff --git a/avprobe.c b/avprobe.c index 53138943ee..f809e46ae1 100644 --- a/avprobe.c +++ b/avprobe.c @@ -757,7 +757,7 @@ static int opt_format(const char *opt, const char *arg) return 0; } -static void opt_output_format(const char *opt, const char *arg) +static int opt_output_format(const char *opt, const char *arg) { if (!strcmp(arg, "json")) { @@ -781,8 +781,9 @@ static void opt_output_format(const char *opt, const char *arg) print_string = ini_print_string; } else { av_log(NULL, AV_LOG_ERROR, "Unsupported formatter %s\n", arg); - exit(1); + return AVERROR(EINVAL); } + return 0; } static int opt_show_format_entry(const char *opt, const char *arg) -- cgit v1.2.3