From 3a278992bdd8138eeefc9df06878703480f27b1b Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Sun, 14 Mar 2004 04:04:08 +0000 Subject: remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG -> MKTAG/MKBETAG Originally committed as revision 2886 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/segafilm.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'libavformat/segafilm.c') diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 3d1b48b..fc54f30 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; -- cgit v1.1