diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-03-14 04:04:08 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-03-14 04:04:08 +0000 |
| commit | 3a278992bdd8138eeefc9df06878703480f27b1b (patch) | |
| tree | 6891b1a6c885f6c5dd68843695739c53c8741c9b /libavformat/psxstr.c | |
| parent | 9eef2b77b29189606148e1fdf5d6c8d7b52b08b0 (diff) | |
| download | ffmpeg-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/psxstr.c')
| -rw-r--r-- | libavformat/psxstr.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 9b5140787e..88c44dff4e 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -31,20 +31,8 @@ //#define PRINTSTUFF -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch0) | \ - ( (long)(unsigned char)(ch1) << 8 ) | \ - ( (long)(unsigned char)(ch2) << 16 ) | \ - ( (long)(unsigned char)(ch3) << 24 ) ) - -#define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F') -#define CDXA_TAG FOURCC_TAG('C', 'D', 'X', 'A') +#define RIFF_TAG MKTAG('R', 'I', 'F', 'F') +#define CDXA_TAG MKTAG('C', 'D', 'X', 'A') #define RAW_CD_SECTOR_SIZE 2352 #define RAW_CD_SECTOR_DATA_SIZE 2304 |