diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-17 20:57:37 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-17 20:57:37 +0200 |
| commit | 9acdd1f2356605d742f236ca275460dd9928bb11 (patch) | |
| tree | 8ddba80cdf284cafdcac44de39f8099f396c0ed4 /src/demuxers/demux_mpeg.c | |
| parent | 42dc706af7a1f43c7ded0cc28957c8beb9ab08b1 (diff) | |
| parent | 5935b6fbe5c4d83ea35a1464b3a1c32e00b23304 (diff) | |
| download | xine-lib-9acdd1f2356605d742f236ca275460dd9928bb11.tar.gz xine-lib-9acdd1f2356605d742f236ca275460dd9928bb11.tar.bz2 | |
Merge changes from Solaris branch. (1.2 branch commit).
Diffstat (limited to 'src/demuxers/demux_mpeg.c')
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index c9d49efa2..145721ce3 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -140,8 +140,8 @@ static void find_mdat_atom(input_plugin_t *input, off_t *mdat_offset, ATOM_PREAMBLE_SIZE) break; - atom_size = BE_32(&atom_preamble[0]); - atom = BE_32(&atom_preamble[4]); + atom_size = _X_BE_32(&atom_preamble[0]); + atom = _X_BE_32(&atom_preamble[4]); if (atom == MDAT_ATOM) { *mdat_offset = input->get_current_pos(input) - ATOM_PREAMBLE_SIZE; @@ -165,9 +165,9 @@ static void find_mdat_atom(input_plugin_t *input, off_t *mdat_offset, ATOM_PREAMBLE_SIZE) break; - atom_size = BE_32(&atom_preamble[0]); + atom_size = _X_BE_32(&atom_preamble[0]); atom_size <<= 32; - atom_size |= BE_32(&atom_preamble[4]); + atom_size |= _X_BE_32(&atom_preamble[4]); atom_size -= ATOM_PREAMBLE_SIZE * 2; } else atom_size -= ATOM_PREAMBLE_SIZE; @@ -1157,7 +1157,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } /* special case for MPEG streams with a RIFF header */ - fourcc_tag = BE_32(&buf[0]); + fourcc_tag = _X_BE_32(&buf[0]); if (fourcc_tag == RIFF_TAG) { uint8_t large_buf[1024]; @@ -1165,7 +1165,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str free(this); return NULL; } - fourcc_tag = BE_32(&large_buf[8]); + fourcc_tag = _X_BE_32(&large_buf[8]); /* disregard the RIFF file if it is certainly a better known * format like AVI or WAVE */ if ((fourcc_tag == WAVE_TAG) || @@ -1185,7 +1185,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str if (input->read(input, large_buf, 1024) != 1024) break; for (j = 0; j < 1024 - 4; j++) { - if (BE_32(&large_buf[j]) == MPEG_MARKER) { + if (_X_BE_32(&large_buf[j]) == MPEG_MARKER) { ok = 1; break; } |