diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-10 23:11:45 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:43 +0200 |
| commit | ce19a13986366faae75408fd55914205d0e52180 (patch) | |
| tree | 9385a9a4c3bcecf4bbf7bb0b5153f7b83ae81ae2 /libmpdemux | |
| parent | 5f65cbcc07ae3a47155de5d3c825e6a248065f9f (diff) | |
| download | mpv-ce19a13986366faae75408fd55914205d0e52180.tar.bz2 mpv-ce19a13986366faae75408fd55914205d0e52180.tar.xz | |
asfheader, demux_audio: Remove some pointless be2me/le2me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31685 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/asfheader.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_audio.c | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index bc4ab34e67..50a83b75d9 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -630,8 +630,7 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){ for( i=0 ; i<stream_count ; i++ ) { stream_id = AV_RL16(ptr); ptr += sizeof(uint16_t); - memcpy(&max_bitrate, ptr, sizeof(uint32_t));// workaround unaligment bug on sparc - max_bitrate = le2me_32(max_bitrate); + max_bitrate = AV_RL32(ptr); ptr += sizeof(uint32_t); mp_msg(MSGT_HEADER,MSGL_V," stream id=[0x%x][%u]\n", stream_id, stream_id ); mp_msg(MSGT_HEADER,MSGL_V," max bitrate=[0x%x][%u]\n", max_bitrate, max_bitrate ); @@ -651,8 +650,7 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){ return 0; } // read length of chunk - stream_read(demuxer->stream, (char *)&data_len, sizeof(data_len)); - data_len = le2me_64(data_len); + data_len = stream_read_qword_le(demuxer->stream); demuxer->movi_start = stream_tell(demuxer->stream) + 26; demuxer->movi_end = start + data_len; mp_msg(MSGT_HEADER, MSGL_V, "Found movie at 0x%X - 0x%X\n", diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 35844a344f..38f1d2afd2 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -481,13 +481,12 @@ static int demux_audio_open(demuxer_t* demuxer) { if (demuxer->movi_end > demuxer->movi_start) { // try to find out approx. bitrate int64_t size = demuxer->movi_end - demuxer->movi_start; - int64_t num_samples = 0; - int32_t srate = 0; + int64_t num_samples; + int32_t srate; stream_skip(s, 14); - stream_read(s, (char *)&srate, 3); - srate = be2me_32(srate) >> 12; - stream_read(s, (char *)&num_samples, 5); - num_samples = (be2me_64(num_samples) >> 24) & 0xfffffffffULL; + srate = stream_read_int24(s) >> 4; + num_samples = stream_read_int24(s) << 16; + num_samples |= stream_read_word(s); if (num_samples && srate) sh_audio->i_bps = size * srate / num_samples; } |