[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24003] branches/soc-2009-chingachgook/ extern/xvidcore/src/image/qpel.c: Merge from trunk terminates with:

[Arystanbek Dyussenov]

Revision: 24003
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24003
Author:   kazanbas
Date:     2009-10-20 16:49:54 +0200 (Tue, 20 Oct 2009)

Log Message:
-----------
Merge from trunk terminates with:

svn: File 'extern/xvidcore/src/image/qpel.c' has inconsistent newlines

So I did `dos2unix extern/xvidcore/src/image/qpel.c`

Modified Paths:
--------------
    branches/soc-2009-chingachgook/extern/xvidcore/src/image/qpel.c

Modified: branches/soc-2009-chingachgook/extern/xvidcore/src/image/qpel.c
===================================================================
--- branches/soc-2009-chingachgook/extern/xvidcore/src/image/qpel.c	2009-10-20 13:59:26 UTC (rev 24002)
+++ branches/soc-2009-chingachgook/extern/xvidcore/src/image/qpel.c	2009-10-20 14:49:54 UTC (rev 24003)
@@ -243,7 +243,7 @@
 /* mmx impl. declaration (see. qpel_mmx.asm
  ****************************************************************************/
 
-#if defined (ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+#if defined (ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_16_mmx);
 extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_16_mmx);
 extern XVID_QP_PASS_SIGNATURE(xvid_H_Pass_Avrg_Up_16_mmx);
@@ -371,7 +371,7 @@
 #endif
 
 /* Arrays definitions, according to the target platform */
-
+
 #if !defined(ARCH_IS_X86_64) && !defined(ARCH_IS_IA32)
 /* Only ia32/ia64 will use these tables outside this file so mark them
 * static for all other archs */