diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-06 00:35:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-06 00:36:19 +0200 |
| commit | 1b168e3bcf6f025b7be64d9dd29dbcb54cb63042 (patch) | |
| tree | a91abb5fecec9d2c3afafd0cc4c1d2198f483255 /libavutil/cpu.c | |
| parent | 296b01d7f91f8d595269f1137f37d4b9671bfafa (diff) | |
| download | ffmpeg-1b168e3bcf6f025b7be64d9dd29dbcb54cb63042.tar.gz | |
avutil/cpu: fix cpu-test to work with ffmpegs cpuflags syntax
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
| -rw-r--r-- | libavutil/cpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 1192619b70..03f89cb674 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -357,10 +357,11 @@ int main(int argc, char **argv) switch (c) { case 'c': { - int cpuflags = av_parse_cpu_flags(optarg); - if (cpuflags < 0) + unsigned flags = av_get_cpu_flags(); + if (av_parse_cpu_caps(&flags, optarg) < 0) return 2; - av_set_cpu_flags_mask(cpuflags); + + av_force_cpu_flags(flags); break; } case 't': |