[FFmpeg-cvslog] r29010 - in trunk/libswscale: yuv2rgb.c yuv2rgb_template.c

[Reimar Döffinger]

On Sat, Mar 21, 2009 at 11:35:43AM +0100, C?dric Schieli wrote:
> Index: yuv2rgb.c
> ===================================================================
> --- yuv2rgb.c	(revision 29020)
> +++ yuv2rgb.c	(working copy)
> @@ -508,7 +508,9 @@
>          switch (c->dstFormat) {
>          case PIX_FMT_RGB32:
>              if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
> -                if (HAVE_7REGS) return yuva420_rgb32_MMX2;
> +#if HAVE_7REGS
> +                return yuva420_rgb32_MMX2;
> +#endif
>              }else return yuv420_rgb32_MMX2;
>          case PIX_FMT_BGR24:  return yuv420_rgb24_MMX2;
>          case PIX_FMT_RGB565: return yuv420_rgb16_MMX2;
> @@ -519,7 +521,9 @@
>          switch (c->dstFormat) {
>          case PIX_FMT_RGB32:
>              if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){
> -                if (HAVE_7REGS) return yuva420_rgb32_MMX;
> +#if HAVE_7REGS
> +                return yuva420_rgb32_MMX;
> +#endif
>              }else return yuv420_rgb32_MMX;
>          case PIX_FMT_BGR24:  return yuv420_rgb24_MMX;
>          case PIX_FMT_RGB565: return yuv420_rgb16_MMX;

Well, while you're at it, it would be a good idea to make it not return
yuv420_rgb24_MMX when HAVE_7REGS is disabled.