Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-06-16 02:52:05 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-06-17 02:38:39 +0400
commit17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf (patch)
tree76c44f17b5260d9ad0ccf925516b6329c231f706 /libavcodec/mpegvideo.c
parent5c14b282d1cc407f6b9efb03564ecac75fb59471 (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/mpegvideo.c')
-rw-r--r--libavcodec/mpegvideo.c4
1 files changed, 2 insertions, 2 deletions
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;