summaryrefslogtreecommitdiff
path: root/libavcodec/dsputil.h
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-06-15 15:52:05 -0700
committerMichael Niedermayer <michaelni@gmx.at>2012-06-17 00:38:39 +0200
commit17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf (patch)
tree76c44f17b5260d9ad0ccf925516b6329c231f706 /libavcodec/dsputil.h
parent5c14b282d1cc407f6b9efb03564ecac75fb59471 (diff)
downloadffmpeg-17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf.tar.gz
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/dsputil.h')
-rw-r--r--libavcodec/dsputil.h2
1 files changed, 1 insertions, 1 deletions
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