diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:01:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:01:00 +0200 |
| commit | aa332026488e8e441a4187898534c59cd657e70e (patch) | |
| tree | 1eb1efac80b21a2889c7ea03ead5e203c2ee85c6 /src/3rdparty/libwebp/src/dsp/lossless_enc.c | |
| parent | c6e1c8f3a8e0d0153ff82da88593edb9b7bf8995 (diff) | |
| parent | 62082a63e112e9991b33c2045896ced78ffcb62e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I06492f609fbb58d78738fff6d124b616287b03bd
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/lossless_enc.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/lossless_enc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/lossless_enc.c b/src/3rdparty/libwebp/src/dsp/lossless_enc.c index 92ca3c0..d608326 100644 --- a/src/3rdparty/libwebp/src/dsp/lossless_enc.c +++ b/src/3rdparty/libwebp/src/dsp/lossless_enc.c @@ -863,12 +863,7 @@ extern void VP8LEncDspInitMIPS32(void); extern void VP8LEncDspInitMIPSdspR2(void); extern void VP8LEncDspInitMSA(void); -static volatile VP8CPUInfo lossless_enc_last_cpuinfo_used = - (VP8CPUInfo)&lossless_enc_last_cpuinfo_used; - -WEBP_TSAN_IGNORE_FUNCTION void VP8LEncDspInit(void) { - if (lossless_enc_last_cpuinfo_used == VP8GetCPUInfo) return; - +WEBP_DSP_INIT_FUNC(VP8LEncDspInit) { VP8LDspInit(); #if !WEBP_NEON_OMIT_C_CODE @@ -1011,8 +1006,6 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8LEncDspInit(void) { assert(VP8LPredictorsSub_C[13] != NULL); assert(VP8LPredictorsSub_C[14] != NULL); assert(VP8LPredictorsSub_C[15] != NULL); - - lossless_enc_last_cpuinfo_used = VP8GetCPUInfo; } //------------------------------------------------------------------------------ |