diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 18:23:13 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 18:23:13 +0000 |
| commit | 394304bd5a254fa5cf5d1bef8184e12c82a0b028 (patch) | |
| tree | 16f0b590d90cadf78d92e387f394e73c5b73c956 /libmpdemux | |
| parent | c09ba2546697dd18cb04576103cf7515250ed3d7 (diff) | |
| download | mpv-394304bd5a254fa5cf5d1bef8184e12c82a0b028.tar.bz2 mpv-394304bd5a254fa5cf5d1bef8184e12c82a0b028.tar.xz | |
Use AV_RB32 instead of tivobuffer2hostlong
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24485 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ty.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index c960787b5f..705bbb3a7c 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -454,12 +454,6 @@ static void demux_ty_FindESPacket( unsigned char *header, int headerSize, } } -static int tivobuffer2hostlong( unsigned char *buffer ) -{ - return - buffer[ 0 ] << 24 | buffer[ 1 ] << 16 | buffer[ 2 ] << 8 | buffer[ 3 ]; -} - static unsigned char ty_VideoPacket[] = { 0x00, 0x00, 0x01, 0xe0 }; static unsigned char ty_MPEGAudioPacket[] = { 0x00, 0x00, 0x01, 0xc0 }; static unsigned char ty_AC3AudioPacket[] = { 0x00, 0x00, 0x01, 0xbd }; @@ -555,9 +549,9 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) if ( readSize == CHUNKSIZE ) { - tivo->pesFileId = tivobuffer2hostlong( &chunk[ 0x00 ] ); - tivo->streamType = tivobuffer2hostlong( &chunk[ 0x04 ] ); - tivo->chunkSize = tivobuffer2hostlong( &chunk[ 0x08 ] ); + tivo->pesFileId = AV_RB32(chunk); + tivo->streamType = AV_RB32(chunk + 4); + tivo->chunkSize = AV_RB32(chunk + 8); if ( tivo->pesFileId == TIVO_PES_FILEID ) { @@ -592,10 +586,10 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) if ( readSize == CHUNKSIZE ) { - pesFileId = tivobuffer2hostlong( &chunk[ 0x00 ] ); + pesFileId = AV_RB32(chunk); if ( pesFileId == TIVO_PES_FILEID ) { - size = tivobuffer2hostlong( &chunk[ 0x0c ] ); + size = AV_RB32(chunk + 12); size /= 256; size -= 4; size *= CHUNKSIZE; @@ -665,7 +659,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) } // We found a part header, skip it - pesFileId = tivobuffer2hostlong( &chunk[ 0x00 ] ); + pesFileId = AV_RB32(chunk); if( pesFileId == TIVO_PES_FILEID ) { mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Skipping PART Header\n" ); |