aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-29 14:37:22 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-30 13:56:25 +0200
commit11d957fbd81288e64408e79ed369446346000b29 (patch)
tree72c1812a15ab34be2908a01de8fec89c27fad2ea /avconv.c
parentbbcedade008b5471c71122944cf4dee1951138ec (diff)
downloadffmpeg-11d957fbd81288e64408e79ed369446346000b29.tar.gz
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).
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index 0114f4f21f..ea736066ec 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2398,7 +2398,7 @@ static void parse_cpuflags(int argc, char **argv, const OptionDef *options)
{
int idx = locate_option(argc, argv, options, "cpuflags");
if (idx && argv[idx + 1])
- opt_cpuflags("cpuflags", argv[idx + 1]);
+ opt_cpuflags(NULL, "cpuflags", argv[idx + 1]);
}
int main(int argc, char **argv)