avtools: remove the distinction between func_arg and func2_arg.

func2_arg is the same as func_arg, except it has one additional
parameter. Change all func_arg callbacks to take that parameter (and
ignore it).

1 files changed, 1 insertions, 1 deletions

diff --git a/avconv.h b/avconv.h
index 2d6f60b451..bb32836475 100644
--- a/avconv.h
+++ b/avconv.h
@@ -352,7 +352,7 @@ extern const OptionDef options[];
 void reset_options(OptionsContext *o);
 void show_usage(void);
 
-int opt_cpuflags(const char *opt, const char *arg);
+int opt_cpuflags(void *optctx, const char *opt, const char *arg);
 
 void opt_output_file(void *optctx, const char *filename);