RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge two #ifdefs into one. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26076 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-02-23 14:47:43 +00:00
parent ea42787378
commit 55e51ffed4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpeg2/libmpeg-0.4.1.diff
View File

@ -942,7 +942,7 @@ Index: libmpeg2/motion_comp_iwmmxt.c
=================================================================== ===================================================================
--- libmpeg2/motion_comp_iwmmxt.c (revision 0) --- libmpeg2/motion_comp_iwmmxt.c (revision 0)
+++ libmpeg2/motion_comp_iwmmxt.c (revision 0) +++ libmpeg2/motion_comp_iwmmxt.c (revision 0)
@@ -0,0 +1,61 @@ @@ -0,0 +1,59 @@
+/* +/*
+ * motion_comp_iwmmxt.c + * motion_comp_iwmmxt.c
+ * Copyright (C) 2004 AGAWA Koji <i (AT) atty (DOT) jp> + * Copyright (C) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@ -967,8 +967,7 @@ Index: libmpeg2/motion_comp_iwmmxt.c
+ +
+#include "config.h" +#include "config.h"
+ +
+#ifdef ARCH_ARM +#if defined(ARCH_ARM) && defined(HAVE_IWMMXT)
+#ifdef HAVE_IWMMXT
+ +
+#include <inttypes.h> +#include <inttypes.h>
+ +
@ -1002,5 +1001,4 @@ Index: libmpeg2/motion_comp_iwmmxt.c
+ avg_pixels8_iwmmxt, avg_pixels8_x2_iwmmxt, avg_pixels8_y2_iwmmxt, avg_pixels8_xy2_iwmmxt}, \ + avg_pixels8_iwmmxt, avg_pixels8_x2_iwmmxt, avg_pixels8_y2_iwmmxt, avg_pixels8_xy2_iwmmxt}, \
+}; +};
+ +
+#endif +#endif /* defined(ARCH_ARM) && defined(HAVE_IWMMXT) */
+#endif

6
libmpeg2/motion_comp_iwmmxt.c
View File

@ -22,8 +22,7 @@
#include "config.h" #include "config.h"
#ifdef ARCH_ARM #if defined(ARCH_ARM) && defined(HAVE_IWMMXT)
#ifdef HAVE_IWMMXT
#include <inttypes.h> #include <inttypes.h>
@ -57,5 +56,4 @@ mpeg2_mc_t mpeg2_mc_iwmmxt = {
avg_pixels8_iwmmxt, avg_pixels8_x2_iwmmxt, avg_pixels8_y2_iwmmxt, avg_pixels8_xy2_iwmmxt}, \ avg_pixels8_iwmmxt, avg_pixels8_x2_iwmmxt, avg_pixels8_y2_iwmmxt, avg_pixels8_xy2_iwmmxt}, \
}; };
#endif #endif /* defined(ARCH_ARM) && defined(HAVE_IWMMXT) */
#endif