[MPlayer-cvslog] r19339 - in trunk/libswscale: rgb2rgb.c swscale.c yuv2rgb.c

[Uoti Urpala]

On Fri, 2006-08-11 at 10:55 +0200, Diego Biurrun wrote:
> This is tricky.  mmx_null is used in rgb2rgb_template.c in a place
> surrounded by #ifdef HAVE_MMX, but the problem is that
> rgb2rgb_template.c is #included from rgb2rgb.c with #undef HAVE_MMX just
> before it.

The inclusion with #undef HAVE_MMX is irrelevant. What matters is that a
version is compiled with "#define HAVE_MMX" even if it's not set in
config; the functions actually used out of the compiled ones are chosen
later and do depend on config.

>   Somehow adding #include "config.h" to the top of
> rgb2rgb_template.c had no effect, not that I think it would be correct
> anyway.

Because config.h has tests to avoid being included twice, and it has
already been included in the compilation unit before that location.

> Ideas?

As Reimar said reverting that part should be ok. It's harmless to leave
the two uint64_t constants there even if MMX won't be used.