Revert "Move VLC_FOURCC to vlc_es.h"

This reverts commit 62b9f5b0251b41dbcb2a38902e03fc70cf3677ab.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 2ab9387c58dce4d86e14b53cf3a063eae941ef34..56e7e6dd1e87c1d7788cf34a5c7f98570504838c 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -89,6 +89,22 @@ 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 c8d3051c0aa7f9e39e154da4a5e15b6affb544d4..9a5038e4c9dc851d310f1dcbb624584afc326ba8 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -28,22 +28,6 @@
 #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