diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 12:24:02 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 12:24:02 +0200 |
| commit | 1c313e89e23eea2349830cb2fd89e583c0f05839 (patch) | |
| tree | b9bee7a5ac87547a9a0b55a1c2c54bd63874cf10 /src/demuxers | |
| parent | 8489c0730f2598f5b17ceea99e80f467fab52063 (diff) | |
| download | xine-lib-1c313e89e23eea2349830cb2fd89e583c0f05839.tar.gz xine-lib-1c313e89e23eea2349830cb2fd89e583c0f05839.tar.bz2 | |
Replace the duplicated meFOURCC macro with ME_FOURCC that is declared in bswap.h already.
(transplanted from a7820d16324dbc6fd6b35481a78ff532f59ebe71)
--HG--
extra : transplant_source : %A7%82%0D%162M%BCo%D6%B3T%81%A7%8F%F52%F5%9E%BEq
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_matroska.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 64ac83a03..b45db701e 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -68,13 +68,6 @@ #define MAX(a, b) ((a)>(b)?(a):(b)) #endif -/* FOURCC will be manipulated using machine endian */ -#ifdef WORDS_BIGENDIAN -#define meFOURCC BE_FOURCC -#else -#define meFOURCC LE_FOURCC -#endif - typedef struct { int track_num; off_t *pos; @@ -1319,7 +1312,7 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) { /* create a bitmap info header struct for MPEG 4 */ bih = malloc(sizeof(xine_bmiheader) + track->codec_private_len); bih->biSize = sizeof(xine_bmiheader) + track->codec_private_len; - bih->biCompression = meFOURCC('M', 'P', '4', 'S'); + bih->biCompression = ME_FOURCC('M', 'P', '4', 'S'); bih->biWidth = track->video_track->pixel_width; bih->biHeight = track->video_track->pixel_height; _x_bmiheader_le2me(bih); @@ -1340,7 +1333,7 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) { /* create a bitmap info header struct for h264 */ bih = malloc(sizeof(xine_bmiheader) + track->codec_private_len); bih->biSize = sizeof(xine_bmiheader) + track->codec_private_len; - bih->biCompression = meFOURCC('a', 'v', 'c', '1'); + bih->biCompression = ME_FOURCC('a', 'v', 'c', '1'); bih->biWidth = track->video_track->pixel_width; bih->biHeight = track->video_track->pixel_height; _x_bmiheader_le2me(bih); |