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 /libavcodec/mips | |
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 'libavcodec/mips')
-rw-r--r-- | libavcodec/mips/idctdsp_mips.h | 12 | ||||
-rw-r--r-- | libavcodec/mips/idctdsp_mmi.c | 6 | ||||
-rw-r--r-- | libavcodec/mips/idctdsp_msa.c | 6 | ||||
-rw-r--r-- | libavcodec/mips/me_cmp_mips.h | 2 | ||||
-rw-r--r-- | libavcodec/mips/pixblockdsp_mips.h | 6 | ||||
-rw-r--r-- | libavcodec/mips/pixblockdsp_mmi.c | 4 | ||||
-rw-r--r-- | libavcodec/mips/pixblockdsp_msa.c | 6 |
7 files changed, 21 insertions, 21 deletions
diff --git a/libavcodec/mips/idctdsp_mips.h b/libavcodec/mips/idctdsp_mips.h index 829efebff9..93a77a6bf3 100644 --- a/libavcodec/mips/idctdsp_mips.h +++ b/libavcodec/mips/idctdsp_mips.h @@ -25,13 +25,13 @@ #include "../mpegvideo.h" void ff_put_pixels_clamped_msa(const int16_t *block, - uint8_t *av_restrict pixels, + uint8_t *restrict pixels, ptrdiff_t line_size); void ff_put_signed_pixels_clamped_msa(const int16_t *block, - uint8_t *av_restrict pixels, + uint8_t *restrict pixels, ptrdiff_t line_size); void ff_add_pixels_clamped_msa(const int16_t *block, - uint8_t *av_restrict pixels, + uint8_t *restrict pixels, ptrdiff_t line_size); void ff_j_rev_dct_msa(int16_t *data); void ff_jref_idct_put_msa(uint8_t *dest, ptrdiff_t stride, int16_t *block); @@ -41,11 +41,11 @@ void ff_simple_idct_put_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block) void ff_simple_idct_add_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); void ff_put_pixels_clamped_mmi(const int16_t *block, - uint8_t *av_restrict pixels, ptrdiff_t line_size); + uint8_t *restrict pixels, ptrdiff_t line_size); void ff_put_signed_pixels_clamped_mmi(const int16_t *block, - uint8_t *av_restrict pixels, ptrdiff_t line_size); + uint8_t *restrict pixels, ptrdiff_t line_size); void ff_add_pixels_clamped_mmi(const int16_t *block, - uint8_t *av_restrict pixels, ptrdiff_t line_size); + uint8_t *restrict pixels, ptrdiff_t line_size); void ff_simple_idct_8_mmi(int16_t *block); void ff_simple_idct_put_8_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_simple_idct_add_8_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); diff --git a/libavcodec/mips/idctdsp_mmi.c b/libavcodec/mips/idctdsp_mmi.c index d22e5eedd7..d96b3b1ac6 100644 --- a/libavcodec/mips/idctdsp_mmi.c +++ b/libavcodec/mips/idctdsp_mmi.c @@ -26,7 +26,7 @@ #include "libavutil/mips/mmiutils.h" void ff_put_pixels_clamped_mmi(const int16_t *block, - uint8_t *av_restrict pixels, ptrdiff_t line_size) + uint8_t *restrict pixels, ptrdiff_t line_size) { double ftmp[8]; @@ -83,7 +83,7 @@ void ff_put_pixels_clamped_mmi(const int16_t *block, } void ff_put_signed_pixels_clamped_mmi(const int16_t *block, - uint8_t *av_restrict pixels, ptrdiff_t line_size) + uint8_t *restrict pixels, ptrdiff_t line_size) { double ftmp[5]; @@ -148,7 +148,7 @@ void ff_put_signed_pixels_clamped_mmi(const int16_t *block, } void ff_add_pixels_clamped_mmi(const int16_t *block, - uint8_t *av_restrict pixels, ptrdiff_t line_size) + uint8_t *restrict pixels, ptrdiff_t line_size) { double ftmp[9]; uint64_t tmp[1]; diff --git a/libavcodec/mips/idctdsp_msa.c b/libavcodec/mips/idctdsp_msa.c index b6b98dc7fc..6fd72337f1 100644 --- a/libavcodec/mips/idctdsp_msa.c +++ b/libavcodec/mips/idctdsp_msa.c @@ -125,21 +125,21 @@ static void add_pixels_clamped_msa(const int16_t *block, uint8_t *pixels, } void ff_put_pixels_clamped_msa(const int16_t *block, - uint8_t *av_restrict pixels, + uint8_t *restrict pixels, ptrdiff_t line_size) { put_pixels_clamped_msa(block, pixels, line_size); } void ff_put_signed_pixels_clamped_msa(const int16_t *block, - uint8_t *av_restrict pixels, + uint8_t *restrict pixels, ptrdiff_t line_size) { put_signed_pixels_clamped_msa(block, pixels, line_size); } void ff_add_pixels_clamped_msa(const int16_t *block, - uint8_t *av_restrict pixels, + uint8_t *restrict pixels, ptrdiff_t line_size) { add_pixels_clamped_msa(block, pixels, line_size); diff --git a/libavcodec/mips/me_cmp_mips.h b/libavcodec/mips/me_cmp_mips.h index 728640102a..72b7de70b4 100644 --- a/libavcodec/mips/me_cmp_mips.h +++ b/libavcodec/mips/me_cmp_mips.h @@ -54,7 +54,7 @@ int ff_sse8_msa(MpegEncContext *v, const uint8_t *pu8Src, const uint8_t *pu8Ref, ptrdiff_t stride, int i32Height); int ff_sse4_msa(MpegEncContext *v, const uint8_t *pu8Src, const uint8_t *pu8Ref, ptrdiff_t stride, int i32Height); -void ff_add_pixels8_msa(const uint8_t *av_restrict pixels, int16_t *block, +void ff_add_pixels8_msa(const uint8_t *restrict pixels, int16_t *block, ptrdiff_t stride); #endif // #ifndef AVCODEC_MIPS_ME_CMP_MIPS_H diff --git a/libavcodec/mips/pixblockdsp_mips.h b/libavcodec/mips/pixblockdsp_mips.h index a12b1a6949..7fd137cd09 100644 --- a/libavcodec/mips/pixblockdsp_mips.h +++ b/libavcodec/mips/pixblockdsp_mips.h @@ -24,16 +24,16 @@ #include "../mpegvideo.h" -void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1, +void ff_diff_pixels_msa(int16_t *restrict block, const uint8_t *src1, const uint8_t *src2, ptrdiff_t stride); void ff_get_pixels_16_msa(int16_t *restrict dst, const uint8_t *src, ptrdiff_t stride); void ff_get_pixels_8_msa(int16_t *restrict dst, const uint8_t *src, ptrdiff_t stride); -void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels, +void ff_get_pixels_8_mmi(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride); -void ff_diff_pixels_mmi(int16_t *av_restrict block, const uint8_t *src1, +void ff_diff_pixels_mmi(int16_t *restrict block, const uint8_t *src1, const uint8_t *src2, ptrdiff_t stride); #endif // #ifndef AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H diff --git a/libavcodec/mips/pixblockdsp_mmi.c b/libavcodec/mips/pixblockdsp_mmi.c index 1230f5de88..dea85bf3fa 100644 --- a/libavcodec/mips/pixblockdsp_mmi.c +++ b/libavcodec/mips/pixblockdsp_mmi.c @@ -25,7 +25,7 @@ #include "libavutil/mips/asmdefs.h" #include "libavutil/mips/mmiutils.h" -void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels, +void ff_get_pixels_8_mmi(int16_t *restrict block, const uint8_t *pixels, ptrdiff_t stride) { double ftmp[7]; @@ -94,7 +94,7 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels, ); } -void ff_diff_pixels_mmi(int16_t *av_restrict block, const uint8_t *src1, +void ff_diff_pixels_mmi(int16_t *restrict block, const uint8_t *src1, const uint8_t *src2, ptrdiff_t stride) { double ftmp[5]; diff --git a/libavcodec/mips/pixblockdsp_msa.c b/libavcodec/mips/pixblockdsp_msa.c index 86a4576c1d..1af4d8da5e 100644 --- a/libavcodec/mips/pixblockdsp_msa.c +++ b/libavcodec/mips/pixblockdsp_msa.c @@ -124,19 +124,19 @@ static void copy_width16_msa(const uint8_t *src, int32_t src_stride, } } -void ff_get_pixels_16_msa(int16_t *av_restrict dest, const uint8_t *src, +void ff_get_pixels_16_msa(int16_t *restrict dest, const uint8_t *src, ptrdiff_t stride) { copy_width16_msa(src, stride, (uint8_t *) dest, 16, 8); } -void ff_get_pixels_8_msa(int16_t *av_restrict dest, const uint8_t *src, +void ff_get_pixels_8_msa(int16_t *restrict dest, const uint8_t *src, ptrdiff_t stride) { copy_8bit_to_16bit_width8_msa(src, stride, dest, 8, 8); } -void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1, +void ff_diff_pixels_msa(int16_t *restrict block, const uint8_t *src1, const uint8_t *src2, ptrdiff_t stride) { diff_pixels_msa(block, src1, src2, stride); |