[FFmpeg-cvslog] avcodec/dvdec: Don't use restrict directly to fix build on MSVC

Andreas Rheinhardt git at videolan.org
Mon Nov 11 15:53:10 EET 2019


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Nov 10 02:47:24 2019 +0100| [b25b6432a7345791c488fadba3bd1ac75ebb2cbb] | committer: Michael Niedermayer

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 at gmail.com>
Tested-by: Matthias Troffaes <matthias.troffaes at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b25b6432a7345791c488fadba3bd1ac75ebb2cbb
---

 libavcodec/dvdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index cfa0fb9905..578d7f505f 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;



More information about the ffmpeg-cvslog mailing list