diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-11 21:07:42 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-11 21:07:42 +0000 |
| commit | 4217ab6f149b1d6fa0ee439beaadfa1a65d2daa7 (patch) | |
| tree | c908b4967929244320fef87dc59352f7d167d64f /src/demuxers | |
| parent | 3c175fd21df04c5c0afa160f81aea0c305f69dc5 (diff) | |
| parent | 6a5bcc15286d28e17c52783caf1d5d2b677479dd (diff) | |
| download | xine-lib-4217ab6f149b1d6fa0ee439beaadfa1a65d2daa7.tar.gz xine-lib-4217ab6f149b1d6fa0ee439beaadfa1a65d2daa7.tar.bz2 | |
Merge transplanted patches.
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 ac0d57571..0169651a0 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -65,13 +65,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; @@ -1316,7 +1309,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); @@ -1337,7 +1330,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); |