summaryrefslogtreecommitdiff
path: root/libavformat/segafilm.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-03-14 04:04:08 +0000
committerMike Melanson <mike@multimedia.cx>2004-03-14 04:04:08 +0000
commit3a278992bdd8138eeefc9df06878703480f27b1b (patch)
tree6891b1a6c885f6c5dd68843695739c53c8741c9b /libavformat/segafilm.c
parent9eef2b77b29189606148e1fdf5d6c8d7b52b08b0 (diff)
downloadffmpeg-3a278992bdd8138eeefc9df06878703480f27b1b.tar.gz
remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG ->
MKTAG/MKBETAG Originally committed as revision 2886 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/segafilm.c')
-rw-r--r--libavformat/segafilm.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 3d1b48bbfa..fc54f3095c 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -27,22 +27,10 @@
#include "avformat.h"
-#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \
- (((uint8_t*)(x))[1] << 16) | \
- (((uint8_t*)(x))[2] << 8) | \
- ((uint8_t*)(x))[3])
-
-#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
- ( (long)(unsigned char)(ch3) | \
- ( (long)(unsigned char)(ch2) << 8 ) | \
- ( (long)(unsigned char)(ch1) << 16 ) | \
- ( (long)(unsigned char)(ch0) << 24 ) )
-
-#define FILM_TAG FOURCC_TAG('F', 'I', 'L', 'M')
-#define FDSC_TAG FOURCC_TAG('F', 'D', 'S', 'C')
-#define STAB_TAG FOURCC_TAG('S', 'T', 'A', 'B')
-#define CVID_TAG FOURCC_TAG('c', 'v', 'i', 'd')
+#define FILM_TAG MKBETAG('F', 'I', 'L', 'M')
+#define FDSC_TAG MKBETAG('F', 'D', 'S', 'C')
+#define STAB_TAG MKBETAG('S', 'T', 'A', 'B')
+#define CVID_TAG MKBETAG('c', 'v', 'i', 'd')
typedef struct {
int stream;