summaryrefslogtreecommitdiffstats
path: root/libmpeg2/libmpeg-0.4.1.diff
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-23 14:47:43 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-23 14:47:43 +0000
commit55e51ffed41c65cb0a4c8ea43d837e0b86fae100 (patch)
tree55b0b1c23945153b9cc379e145c56c8934762c45 /libmpeg2/libmpeg-0.4.1.diff
parentea427873781f6e6bbae9bc29426ec3136f9ddca3 (diff)
downloadmpv-55e51ffed41c65cb0a4c8ea43d837e0b86fae100.tar.bz2
mpv-55e51ffed41c65cb0a4c8ea43d837e0b86fae100.tar.xz
Merge two #ifdefs into one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26076 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/libmpeg-0.4.1.diff')
-rw-r--r--libmpeg2/libmpeg-0.4.1.diff8
1 files changed, 3 insertions, 5 deletions
diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff
index 049ef2ea93..c80616c972 100644
--- a/libmpeg2/libmpeg-0.4.1.diff
+++ b/libmpeg2/libmpeg-0.4.1.diff
@@ -942,7 +942,7 @@ Index: libmpeg2/motion_comp_iwmmxt.c
===================================================================
--- 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
+ * Copyright (C) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@@ -967,8 +967,7 @@ Index: libmpeg2/motion_comp_iwmmxt.c
+
+#include "config.h"
+
-+#ifdef ARCH_ARM
-+#ifdef HAVE_IWMMXT
++#if defined(ARCH_ARM) && defined(HAVE_IWMMXT)
+
+#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}, \
+};
+
-+#endif
-+#endif
++#endif /* defined(ARCH_ARM) && defined(HAVE_IWMMXT) */