]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/dvdec: Don't use restrict directly to fix build on MSVC
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Sun, 10 Nov 2019 01:47:24 +0000 (02:47 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 11 Nov 2019 13:51:09 +0000 (14:51 +0100)
004ebd4b added a function with a parameter that was declared as restrict
and not av_restrict. This is not supported by MSVC as several FATE-boxes
that now fail to build show. So use av_restrict.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tested-by: Matthias Troffaes <matthias.troffaes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dvdec.c

index cfa0fb9905abb52e991b87f53654ee26daf21fba..578d7f505fbdca74be5106293f6ebafcf2df5027 100644 (file)
@@ -269,7 +269,7 @@ static inline void bit_copy(PutBitContext *pb, GetBitContext *gb)
         put_bits(pb, bits_left, get_bits(gb, bits_left));
 }
 
-static av_always_inline void put_block_8x4(int16_t *block, uint8_t *restrict p, int stride)
+static av_always_inline void put_block_8x4(int16_t *block, uint8_t *av_restrict p, int stride)
 {
     int i, j;
     const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;