From 55e51ffed41c65cb0a4c8ea43d837e0b86fae100 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 23 Feb 2008 14:47:43 +0000
Subject: Merge two #ifdefs into one.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26076 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpeg2/libmpeg-0.4.1.diff   | 8 +++-----
 libmpeg2/motion_comp_iwmmxt.c | 6 ++----
 2 files changed, 5 insertions(+), 9 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) */
diff --git a/libmpeg2/motion_comp_iwmmxt.c b/libmpeg2/motion_comp_iwmmxt.c
index 3d583ed076..a43a3b4e94 100644
--- a/libmpeg2/motion_comp_iwmmxt.c
+++ b/libmpeg2/motion_comp_iwmmxt.c
@@ -22,8 +22,7 @@
 
 #include "config.h"
 
-#ifdef ARCH_ARM
-#ifdef HAVE_IWMMXT
+#if defined(ARCH_ARM) && defined(HAVE_IWMMXT)
 
 #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}, \
 };
 
-#endif
-#endif
+#endif /* defined(ARCH_ARM) && defined(HAVE_IWMMXT) */
-- 
cgit v1.2.3