[libav-devel] [PATCH] arm: dsputil: Add missing config.h #include for restrict keyword

Diego Biurrun diego at biurrun.de
Fri Mar 14 11:31:16 CET 2014


On Fri, Mar 14, 2014 at 12:26:05PM +0200, Martin Storsjö wrote:
> On Fri, 14 Mar 2014, Diego Biurrun wrote:
> >--- a/libavcodec/arm/dsputil_init_armv6.c
> >+++ b/libavcodec/arm/dsputil_init_armv6.c
> >@@ -20,6 +20,7 @@
> >
> >+#include "config.h"
> >#include "libavutil/attributes.h"
> >#include "libavcodec/avcodec.h"
> >#include "libavcodec/dsputil.h"
> 
> We could just as well drop the restrict keyword - before
> compiliation was broken this used to produce a warning:
> 
> libavcodec/arm/dsputil_init_armv6.c(69) : warning C4028: formal
> parameter 2 different from declaration
> 
> (It's harmless though - the function takes a restrict parameter, but
> the function is set to a function pointer that doesn't have the
> restrict keyword for that parameter.)

You mean drop the restrict parameter globally or just from this ARM
optimization bit?

> The fact that this fixed a broken build should IMO be mentioned in
> the commit message, to differentiate this from "let's add headers
> for everything that is needed, even if things compile fine today".
> (FYI ed9625eb was the commit that broke it, I just bisected.)

Amended locally to

  arm: dsputil: Add missing config.h #include for restrict keyword

  This fixes the build for MSVC builds that don't recognize "restrict".

Diego


More information about the libav-devel mailing list