summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-11-10 02:47:24 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-11 14:51:09 +0100
commitb25b6432a7345791c488fadba3bd1ac75ebb2cbb (patch)
tree1883518b20d039ef4551103c5d6e343526f96e9a
parent66ac7775f7264d2b700708aa7119e2a034532661 (diff)
downloadffmpeg-streaming-b25b6432a7345791c488fadba3bd1ac75ebb2cbb.zip
ffmpeg-streaming-b25b6432a7345791c488fadba3bd1ac75ebb2cbb.tar.gz
avcodec/dvdec: Don't use restrict directly to fix build on MSVC
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>
-rw-r--r--libavcodec/dvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index cfa0fb9..578d7f5 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -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;
OpenPOWER on IntegriCloud