diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 12:41:48 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 12:41:48 +0200 |
| commit | 1e61f032793a3460ad97b0e38b7a1ec58324999d (patch) | |
| tree | 089f2bc37b0136b970a8bab6b93088dfe8b0fa80 | |
| parent | 2cd2c726e9f98104261143e8c6f4d1c839275461 (diff) | |
| download | xine-lib-1e61f032793a3460ad97b0e38b7a1ec58324999d.tar.gz xine-lib-1e61f032793a3460ad97b0e38b7a1ec58324999d.tar.bz2 | |
Instead of recreating the FOURCC_32 wheel, use ME_FOURCC and read directly a 32-bit value.
| -rw-r--r-- | src/demuxers/demux_tta.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index 2e4808b9c..81b9c6ede 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -65,16 +65,14 @@ typedef struct { demux_class_t demux_class; } demux_tta_class_t; -#define FOURCC_32(a, b, c, d) (d + (c<<8) + (b<<16) + (a<<24)) - static int open_tta_file(demux_tta_t *this) { - uint8_t peek[4]; + uint32_t peek; uint32_t framelen; - if (_x_demux_read_header(this->input, peek, 4) != 4) + if (_x_demux_read_header(this->input, &peek, 4) != 4) return 0; - if ( BE_32(peek) != FOURCC_32('T', 'T', 'A', '1') ) + if ( peek != ME_FOURCC('T', 'T', 'A', '1') ) return 0; if ( this->input->read(this->input, this->header.buffer, sizeof(this->header)) != sizeof(this->header) ) |