Changeset 9970930dbc8ce19f3bbea188481868ee61744b9b

Timestamp:

26/05/08 20:56:55 (6 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1211828215 +0300

git-parent:

[562773d60e1775780f5fb301670b8d515f0612d3]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1211826595 +0300

Message:

Revert "Move VLC_FOURCC to vlc_es.h"

This reverts commit 62b9f5b0251b41dbcb2a38902e03fc70cf3677ab.

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_es.h (modified) (1 diff)

include/vlc_common.h

@@ -89 +89 @@
- */
-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 )

include/vlc_es.h

@@ -29 +29 @@
-#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