From 62b9f5b0251b41dbcb2a38902e03fc70cf3677ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Mon, 26 May 2008 21:11:01 +0300
Subject: [PATCH] Move VLC_FOURCC to vlc_es.h
---
include/vlc_common.h | 16 ----------------
include/vlc_es.h | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 56e7e6dd1e87..2ab9387c58dc 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -89,22 +89,6 @@ typedef int64_t mtime_t;
*/
typedef uint32_t vlc_fourcc_t;
-#ifdef WORDS_BIGENDIAN
-# define VLC_FOURCC( a, b, c, d ) \
- ( ((uint32_t)d) | ( ((uint32_t)c) << 8 ) \
- | ( ((uint32_t)b) << 16 ) | ( ((uint32_t)a) << 24 ) )
-# define VLC_TWOCC( a, b ) \
- ( (uint16_t)(b) | ( (uint16_t)(a) << 8 ) )
-
-#else
-# define VLC_FOURCC( a, b, c, d ) \
- ( ((uint32_t)a) | ( ((uint32_t)b) << 8 ) \
- | ( ((uint32_t)c) << 16 ) | ( ((uint32_t)d) << 24 ) )
-# define VLC_TWOCC( a, b ) \
- ( (uint16_t)(a) | ( (uint16_t)(b) << 8 ) )
-
-#endif
-
static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc )
{
memcpy( psz_fourcc, &fcc, 4 );
diff --git a/include/vlc_es.h b/include/vlc_es.h
index 9a5038e4c9dc..c8d3051c0aa7 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -28,6 +28,22 @@
#ifndef _VLC_ES_H
#define _VLC_ES_H 1
+#ifdef WORDS_BIGENDIAN
+# define VLC_FOURCC( a, b, c, d ) \
+ ( ((uint32_t)d) | ( ((uint32_t)c) << 8 ) \
+ | ( ((uint32_t)b) << 16 ) | ( ((uint32_t)a) << 24 ) )
+# define VLC_TWOCC( a, b ) \
+ ( (uint16_t)(b) | ( (uint16_t)(a) << 8 ) )
+
+#else
+# define VLC_FOURCC( a, b, c, d ) \
+ ( ((uint32_t)a) | ( ((uint32_t)b) << 8 ) \
+ | ( ((uint32_t)c) << 16 ) | ( ((uint32_t)d) << 24 ) )
+# define VLC_TWOCC( a, b ) \
+ ( (uint16_t)(a) | ( (uint16_t)(b) << 8 ) )
+
+#endif
+
/**
* \file
* This file defines the elementary streams format types
--
GitLab