Merge remote-tracking branch 'qatar/master'

[ffmpeg] / ffmpeg.c

diff --git a/ffmpeg.c b/ffmpeg.c
index 7afec4ce0dc29dff78406b7873c5d732a6e0a8cc..5499d5d7bd8e02af4fb6216c7e8b5431821a8016 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4963,6 +4963,13 @@ static int opt_deinterlace(const char *opt, const char *arg)
     return 0;
 }
 
+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]);
+}
+
 #define OFFSET(x) offsetof(OptionsContext, x)
 static const OptionDef options[] = {
     /* main options */
@@ -5136,6 +5143,8 @@ int main(int argc, char **argv)
 
     term_init();
 
+    parse_cpuflags(argc, argv, options);
+
     /* parse options */
     parse_options(&o, argc, argv, options, opt_output_file);