Mercurial > mplayer.hg

changeset 28315:82cf99fc9d2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix #endif comments.
author diego
date Sun, 25 Jan 2009 11:33:35 +0000
parents 3e4486488465
children da307fb1c239
files libswscale/swscale.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Sat Jan 24 22:14:32 2009 +0000
+++ b/libswscale/swscale.c	Sun Jan 25 11:33:35 2009 +0000
@@ -257,7 +257,7 @@
 
 DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUVOffset)= 0x0040400000404000ULL;
 
-#endif /* ARCH_X86 */
+#endif /* ARCH_X86 && CONFIG_GPL */
 
 // clipping helper table for C implementations:
 static unsigned char clip_table[768];
@@ -962,7 +962,7 @@
 #if ARCH_PPC
 #if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
 #define COMPILE_ALTIVEC
-#endif //HAVE_ALTIVEC
+#endif
 #endif //ARCH_PPC
 
 #if ARCH_X86
@@ -978,7 +978,7 @@
 #if ((HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
 #define COMPILE_3DNOW
 #endif
-#endif //ARCH_X86 || ARCH_X86_64
+#endif //ARCH_X86
 
 #undef HAVE_MMX
 #undef HAVE_MMX2
@@ -1053,7 +1053,7 @@
 #include "swscale_template.c"
 #endif
 
-#endif //ARCH_X86 || ARCH_X86_64
+#endif //ARCH_X86
 
 // minor note: the HAVE_xyz is messed up after that line so don't use it
 
@@ -3154,7 +3154,7 @@
 #endif
     c->funnyYCode=NULL;
     c->funnyUVCode=NULL;
-#endif /* ARCH_X86 */
+#endif /* ARCH_X86 && CONFIG_GPL */
 
     av_freep(&c->lumMmx2Filter);
     av_freep(&c->chrMmx2Filter);