aboutsummaryrefslogtreecommitdiffstats
path: root/avprobe.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-28 14:43:54 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-04 13:12:00 +0200
commit7cc8d6385aaf1005700305f21d5d56b51b38c537 (patch)
tree73aff2665f8eef3fb60f7babe7403692f3d67b0f /avprobe.c
parent7efe05ab298ae18437c9796f43b9f47474763a39 (diff)
downloadffmpeg-7cc8d6385aaf1005700305f21d5d56b51b38c537.tar.gz
cmdutils: add support for caller-provided option context.
This is the first step to removing the globals plague from avtools.
Diffstat (limited to 'avprobe.c')
-rw-r--r--avprobe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/avprobe.c b/avprobe.c
index a8a0f14eb7..5e83916f87 100644
--- a/avprobe.c
+++ b/avprobe.c
@@ -346,7 +346,7 @@ static int opt_format(const char *opt, const char *arg)
return 0;
}
-static void opt_input_file(const char *arg)
+static void opt_input_file(void *optctx, const char *arg)
{
if (input_filename) {
fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
@@ -406,7 +406,7 @@ int main(int argc, char **argv)
#endif
show_banner();
- parse_options(argc, argv, options, opt_input_file);
+ parse_options(NULL, argc, argv, options, opt_input_file);
if (!input_filename) {
show_usage();