diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-06-16 02:52:05 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 02:38:39 +0400 |
| commit | 17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf (patch) | |
| tree | 76c44f17b5260d9ad0ccf925516b6329c231f706 /libavcodec | |
| parent | 5c14b282d1cc407f6b9efb03564ecac75fb59471 (diff) | |
Change all uses of restrict to use av_restrict instead.
Defining restrict results - for some compilers - in changing other
uses of the restrict keyword also, e.g. __declspec(restrict) gets
changed to __declspec(__restrict) on MSVC. This causes compilation
failures. Therefore, using a private namespace macro instead is
more reliable and robust.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.c | 2 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 2 | ||||
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index b2d5d357d5..81521ea376 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2517,7 +2517,7 @@ static void vector_fmac_scalar_c(float *dst, const float *src, float mul, dst[i] += src[i] * mul; } -static void butterflies_float_c(float *restrict v1, float *restrict v2, +static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, int len) { int i; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f934c59245..67dd269fd4 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -444,7 +444,7 @@ typedef struct DSPContext { * @param v2 second input vector, difference output, 16-byte aligned * @param len length of vectors, multiple of 4 */ - void (*butterflies_float)(float *restrict v1, float *restrict v2, int len); + void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len); /** * Calculate the sum and difference of two vectors of floats and interleave diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 58375becc9..7c6f4f952d 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -210,7 +210,7 @@ static int h263_decode_gob_header(MpegEncContext *s) * @param end pointer to the end of the buffer * @return pointer to the next resync_marker, or end if none was found */ -const uint8_t *ff_h263_find_resync_marker(const uint8_t *restrict p, const uint8_t * restrict end) +const uint8_t *ff_h263_find_resync_marker(const uint8_t *av_restrict p, const uint8_t *av_restrict end) { assert(p < end); diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 705951af34..33feb532a9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -140,9 +140,9 @@ const enum PixelFormat ff_hwaccel_pixfmt_list_420[] = { PIX_FMT_NONE }; -const uint8_t *avpriv_mpv_find_start_code(const uint8_t *restrict p, +const uint8_t *avpriv_mpv_find_start_code(const uint8_t *av_restrict p, const uint8_t *end, - uint32_t * restrict state) + uint32_t *av_restrict state) { int i; |