diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-03-10 17:14:55 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-03-15 12:51:15 +0100 |
commit | c00cd007e842b522dc9fbd219e6d32fe9212465b (patch) | |
tree | 42709f94d29cbe913b68eb52fafbc6db933f1773 /libavutil | |
parent | 53a51e70f27b6af5b051b51de4b1e246cf6003c7 (diff) | |
download | ffmpeg-c00cd007e842b522dc9fbd219e6d32fe9212465b.tar.gz |
configure: Remove av_restrict
All versions of MSVC that support C11 (namely >= v19.27)
also support the restrict keyword, therefore av_restrict
is no longer necessary since 75697836b1db3e0f0a3b7061be6be28d00c675a0.
Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/arm/float_dsp_init_vfp.c | 2 | ||||
-rw-r--r-- | libavutil/fixed_dsp.c | 2 | ||||
-rw-r--r-- | libavutil/fixed_dsp.h | 3 | ||||
-rw-r--r-- | libavutil/float_dsp.c | 2 | ||||
-rw-r--r-- | libavutil/float_dsp.h | 4 | ||||
-rw-r--r-- | libavutil/mips/float_dsp_mips.c | 2 | ||||
-rw-r--r-- | libavutil/x86/fixed_dsp_init.c | 4 | ||||
-rw-r--r-- | libavutil/x86/float_dsp_init.c | 5 |
8 files changed, 8 insertions, 16 deletions
diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c index 05873e7e37..6d6237aae8 100644 --- a/libavutil/arm/float_dsp_init_vfp.c +++ b/libavutil/arm/float_dsp_init_vfp.c @@ -32,7 +32,7 @@ void ff_vector_fmul_window_vfp(float *dst, const float *src0, void ff_vector_fmul_reverse_vfp(float *dst, const float *src0, const float *src1, int len); -void ff_butterflies_float_vfp(float *av_restrict v1, float *av_restrict v2, int len); +void ff_butterflies_float_vfp(float *restrict v1, float *restrict v2, int len); av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags) { diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c index 5ab47d55d0..b144aa359e 100644 --- a/libavutil/fixed_dsp.c +++ b/libavutil/fixed_dsp.c @@ -135,7 +135,7 @@ static int scalarproduct_fixed_c(const int *v1, const int *v2, int len) return (int)(p >> 31); } -static void butterflies_fixed_c(int *av_restrict v1s, int *av_restrict v2, int len) +static void butterflies_fixed_c(int *restrict v1s, int *restrict v2, int len) { int i; unsigned int *v1 = v1s; diff --git a/libavutil/fixed_dsp.h b/libavutil/fixed_dsp.h index 1217d3a53b..9b566af675 100644 --- a/libavutil/fixed_dsp.h +++ b/libavutil/fixed_dsp.h @@ -49,7 +49,6 @@ #define AVUTIL_FIXED_DSP_H #include <stdint.h> -#include "config.h" #include "attributes.h" #include "libavcodec/mathops.h" @@ -150,7 +149,7 @@ typedef struct AVFixedDSPContext { * @param v2 second input vector, difference output, 16-byte aligned * @param len length of vectors, multiple of 4 */ - void (*butterflies_fixed)(int *av_restrict v1, int *av_restrict v2, int len); + void (*butterflies_fixed)(int *restrict v1, int *restrict v2, int len); } AVFixedDSPContext; /** diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index 742dd679d2..e9fb023466 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -109,7 +109,7 @@ static void vector_fmul_reverse_c(float *dst, const float *src0, dst[i] = src0[i] * src1[-i]; } -static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, +static void butterflies_float_c(float *restrict v1, float *restrict v2, int len) { int i; diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h index 7cad9fc622..342a8715c5 100644 --- a/libavutil/float_dsp.h +++ b/libavutil/float_dsp.h @@ -19,8 +19,6 @@ #ifndef AVUTIL_FLOAT_DSP_H #define AVUTIL_FLOAT_DSP_H -#include "config.h" - typedef struct AVFloatDSPContext { /** * Calculate the entry wise product of two vectors of floats and store the result in @@ -161,7 +159,7 @@ typedef struct AVFloatDSPContext { * @param v2 second input vector, difference output, 16-byte aligned * @param len length of vectors, multiple of 4 */ - void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len); + void (*butterflies_float)(float *restrict v1, float *restrict v2, int len); /** * Calculate the scalar product of two vectors of floats. diff --git a/libavutil/mips/float_dsp_mips.c b/libavutil/mips/float_dsp_mips.c index 0943d6f343..8f31b9171b 100644 --- a/libavutil/mips/float_dsp_mips.c +++ b/libavutil/mips/float_dsp_mips.c @@ -224,7 +224,7 @@ static void vector_fmul_window_mips(float *dst, const float *src0, ); } -static void butterflies_float_mips(float *av_restrict v1, float *av_restrict v2, +static void butterflies_float_mips(float *restrict v1, float *restrict v2, int len) { float temp0, temp1, temp2, temp3, temp4; diff --git a/libavutil/x86/fixed_dsp_init.c b/libavutil/x86/fixed_dsp_init.c index d3f4b2e325..3dd508a4f4 100644 --- a/libavutil/x86/fixed_dsp_init.c +++ b/libavutil/x86/fixed_dsp_init.c @@ -16,14 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/fixed_dsp.h" #include "cpu.h" -void ff_butterflies_fixed_sse2(int *av_restrict src0, int *av_restrict src1, int len); +void ff_butterflies_fixed_sse2(int *restrict src0, int *restrict src1, int len); av_cold void ff_fixed_dsp_init_x86(AVFixedDSPContext *fdsp) { diff --git a/libavutil/x86/float_dsp_init.c b/libavutil/x86/float_dsp_init.c index ad6b506259..093bce9b94 100644 --- a/libavutil/x86/float_dsp_init.c +++ b/libavutil/x86/float_dsp_init.c @@ -16,13 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/float_dsp.h" #include "cpu.h" -#include "asm.h" void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1, int len); @@ -76,7 +73,7 @@ void ff_vector_fmul_reverse_avx2(float *dst, const float *src0, float ff_scalarproduct_float_sse(const float *v1, const float *v2, int order); float ff_scalarproduct_float_fma3(const float *v1, const float *v2, int order); -void ff_butterflies_float_sse(float *av_restrict src0, float *av_restrict src1, int len); +void ff_butterflies_float_sse(float *restrict src0, float *restrict src1, int len); av_cold void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp) { |