cmdutils: add support for caller-provided option context.

This is the first step to removing the globals plague from avtools.
This commit is contained in:
Anton Khirnov
2011-08-28 14:43:54 +02:00
parent 7efe05ab29
commit 7cc8d6385a
7 changed files with 26 additions and 16 deletions

View File

@ -3702,7 +3702,7 @@ static int opt_streamid(const char *opt, const char *arg)
return 0;
}
static void opt_output_file(const char *filename)
static void opt_output_file(void *optctx, const char *filename)
{
AVFormatContext *oc;
int err, use_video, use_audio, use_subtitle, use_data;
@ -4376,7 +4376,7 @@ int main(int argc, char **argv)
"(see Changelog for the list of incompatible changes).\n");
/* parse options */
parse_options(argc, argv, options, opt_output_file);
parse_options(NULL, argc, argv, options, opt_output_file);
if(nb_output_files <= 0 && nb_input_files == 0) {
show_usage();