diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 02:57:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 03:22:49 +0100 |
| commit | 6df42f98746be06c883ce683563e07c9a2af983f (patch) | |
| tree | 6bb893aaf179526515cfb3b1cc933721317dcf6f /libavutil/cpu.c | |
| parent | 57986c501e8c97d4bd2e1b7ce9e9037c4ae06245 (diff) | |
| parent | b5161908e06b4497bf663510fb495ba97a6fd2b5 (diff) | |
| download | ffmpeg-6df42f98746be06c883ce683563e07c9a2af983f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
SBR DSP: fix SSE code to not use SSE2 instructions.
cpu: initialize mask to -1, so that by default, optimizations are used.
error_resilience: initialize s->block_index[].
svq3: protect against negative quantizers.
Don't use ff_cropTbl[] for IDCT.
swscale: make filterPos 32bit.
FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.
avconv: add -cpuflags option for setting supported cpuflags.
cpu: add av_set_cpu_flags_mask().
libx264: Allow overriding the sliced threads option
avconv: fix counting encoded video size.
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffmpeg.texi
ffmpeg.c
libavcodec/h264idct_template.c
libavcodec/svq3.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h
libswscale/swscale.c
tests/Makefile
tests/fate-run.sh
tests/regression-funcs.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
| -rw-r--r-- | libavutil/cpu.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index fa64a83cfa..fed6093316 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -23,7 +23,7 @@ static int flags, checked; void av_force_cpu_flags(int arg){ flags = arg; - checked = 1; + checked = arg != -1; } int av_get_cpu_flags(void) @@ -39,6 +39,13 @@ int av_get_cpu_flags(void) return flags; } +void av_set_cpu_flags_mask(int mask) +{ + checked = 0; + flags = av_get_cpu_flags() & mask; + checked = 1; +} + #ifdef TEST #undef printf |