From 9ad362d2dd562ca3f15b7e9b9600db68066500ac Mon Sep 17 00:00:00 2001
From: Marco Zuehlke <andruil@users.sourceforge.net>
Date: Thu, 13 Nov 2003 15:23:00 +0000
Subject: define FOURCC only once

CVS patchset: 5729
CVS date: 2003/11/13 15:23:00
---
 src/xine-engine/bswap.h        | 14 ++++++++++++++
 src/xine-engine/buffer_types.c | 14 +++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'src/xine-engine')

diff --git a/src/xine-engine/bswap.h b/src/xine-engine/bswap.h
index a776fc7bf..7d73cff62 100644
--- a/src/xine-engine/bswap.h
+++ b/src/xine-engine/bswap.h
@@ -155,4 +155,18 @@ inline static unsigned long long int ByteSwap64(unsigned long long int x)
 #define AME_64(x) ALE_64(x)
 #endif
 
+
+#define BE_FOURCC( ch0, ch1, ch2, ch3 )             \
+        ( (uint32_t)(unsigned char)(ch3) |          \
+        ( (uint32_t)(unsigned char)(ch2) << 8 ) |   \
+        ( (uint32_t)(unsigned char)(ch1) << 16 ) |  \
+        ( (uint32_t)(unsigned char)(ch0) << 24 ) )
+
+#define LE_FOURCC( ch0, ch1, ch2, ch3 )             \
+        ( (uint32_t)(unsigned char)(ch0) |          \
+        ( (uint32_t)(unsigned char)(ch1) << 8 ) |   \
+        ( (uint32_t)(unsigned char)(ch2) << 16 ) |  \
+        ( (uint32_t)(unsigned char)(ch3) << 24 ) )
+
+
 #endif
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index b4b62688e..a66826662 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer_types.c,v 1.70 2003/11/11 18:45:00 f1rmb Exp $
+ * $Id: buffer_types.c,v 1.71 2003/11/13 15:23:01 andruil Exp $
  *
  *
  * contents:
@@ -40,17 +40,9 @@
 
 /* FOURCC will be manipulated using machine endian */
 #ifdef WORDS_BIGENDIAN
-#define meFOURCC( ch0, ch1, ch2, ch3 )              \
-        ( (uint32_t)(unsigned char)(ch3) |          \
-        ( (uint32_t)(unsigned char)(ch2) << 8 ) |   \
-        ( (uint32_t)(unsigned char)(ch1) << 16 ) |  \
-        ( (uint32_t)(unsigned char)(ch0) << 24 ) )
+#define meFOURCC BE_FOURCC
 #else
-#define meFOURCC( ch0, ch1, ch2, ch3 )              \
-        ( (uint32_t)(unsigned char)(ch0) |          \
-        ( (uint32_t)(unsigned char)(ch1) << 8 ) |   \
-        ( (uint32_t)(unsigned char)(ch2) << 16 ) |  \
-        ( (uint32_t)(unsigned char)(ch3) << 24 ) )
+#define meFOURCC LE_FOURCC
 #endif
 
 
-- 
cgit v1.2.3