[FFmpeg-cvslog] lavu/fixed_dsp: add missing av_restrict qualifiers

Johannes Kauffmann git at videolan.org
Tue Oct 4 12:56:25 EEST 2022


ffmpeg | branch: master | Johannes Kauffmann <johanneskauffmann at hotmail.com> | Sun Sep 25 00:41:18 2022 +0200| [a11e745b97dfc8117bac0cf7049061291195d02c] | committer: Anton Khirnov

lavu/fixed_dsp: add missing av_restrict qualifiers

The butterflies_fixed function pointer declaration specifies av_restrict
for the first two pointer arguments. So the corresponding function
definitions should honor this declaration.

MSVC emits warning C4113 for this.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a11e745b97dfc8117bac0cf7049061291195d02c
---

 libavutil/fixed_dsp.c          | 2 +-
 libavutil/x86/fixed_dsp_init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c
index bc847949dc..5ab47d55d0 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 *v1s, int *v2, int len)
+static void butterflies_fixed_c(int *av_restrict v1s, int *av_restrict v2, int len)
 {
     int i;
     unsigned int *v1 = v1s;
diff --git a/libavutil/x86/fixed_dsp_init.c b/libavutil/x86/fixed_dsp_init.c
index 303a2eb922..d3f4b2e325 100644
--- a/libavutil/x86/fixed_dsp_init.c
+++ b/libavutil/x86/fixed_dsp_init.c
@@ -23,7 +23,7 @@
 #include "libavutil/fixed_dsp.h"
 #include "cpu.h"
 
-void ff_butterflies_fixed_sse2(int *src0, int *src1, int len);
+void ff_butterflies_fixed_sse2(int *av_restrict src0, int *av_restrict src1, int len);
 
 av_cold void ff_fixed_dsp_init_x86(AVFixedDSPContext *fdsp)
 {



More information about the ffmpeg-cvslog mailing list