[MPlayer-users] build fail libswscale deinterleaveBytes_avx undeclared

[Andy Furniss]

Andy Furniss wrote:
> current ffmpeg git is building OK for me but mplayer isn't
>
> make -C ffmpeg libswscale/libswscale.a make[1]: Entering directory
> `/home/andy/Src/Mplayer-svn/mplayer/ffmpeg' CC
> libswscale/x86/rgb2rgb.o In file included from
> ./libavutil/common.h:415:0, from ./libavutil/avutil.h:277, from
> ./libswscale/rgb2rgb.h:31, from libswscale/x86/rgb2rgb.c:34:
> ./libavutil/internal.h:214:5: warning: "HAVE_LIBC_MSVCRT" is not
> defined [-Wundef] In file included from
> libswscale/x86/rgb2rgb.c:120:0: libswscale/x86/rgb2rgb_template.c: In
> function 'rgb2rgb_init_avx':
> libswscale/x86/rgb2rgb_template.c:2529:1: error:
> 'deinterleaveBytes_avx' undeclared (first use in this function)
> libswscale/x86/rgb2rgb_template.c:2529:1: note: each undeclared
> identifier is reported only once for each function it appears in
> make[1]: *** [libswscale/x86/rgb2rgb.o] Error 1 make[1]: Leaving
> directory `/home/andy/Src/Mplayer-svn/mplayer/ffmpeg' make: ***
> [ffmpeg/libswscale/libswscale.a] Error 2

Reverting the below commit fixes the build for me, I guess others aren't
seeing this as it looks like it depends on cpu flags/arch.

I am AMD phenomIIx4 x86_64 cpu flags -

flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge
mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext
fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl
nonstop_tsc extd_apicid pni monitor cx16 popcnt lahf_lm cmp_legacy svm
extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit
wdt hw_pstate npt lbrv svm_lock nrip_save


commit 3f4290a2060be711474dc4a00d525a2cee7f4d1e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Dec 14 02:22:44 2013 +0100

     swscale/x86/rgb2rgb_template: try to fix build without AVX

     Found-by: iive
     Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

diff --git a/libswscale/x86/rgb2rgb_template.c 
b/libswscale/x86/rgb2rgb_template.c
index aaea510..2a2090c 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1926,6 +1926,7 @@ static void RENAME(interleaveBytes)(const uint8_t 
*src1, const uint8_t *src2, ui
  }
  #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX*/

+#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL
  #if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || 
COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == 
COMPILE_TEMPLATE_SSE2 && HAVE_YASM
  void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
                                  const uint8_t *unused0,
@@ -1951,6 +1952,7 @@ static void RENAME(deinterleaveBytes)(const 
uint8_t *src, uint8_t *dst1, uint8_t
              );
  }
  #endif /* !COMPILE_TEMPLATE_AMD3DNOW */
+#endif /* !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL */

  #if !COMPILE_TEMPLATE_SSE2
  #if !COMPILE_TEMPLATE_AMD3DNOW