diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 19:53:09 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 19:53:09 +0000 |
| commit | 8d8edc990a67af12ebbe7679738c2ee14cb18dfa (patch) | |
| tree | b1c5b7de453790408681054f23568e380f41ec13 /libmpdemux/demux_ty.c | |
| parent | fb090bd8fa182d40dbb9389eb9b45c7632f54841 (diff) | |
| download | mpv-8d8edc990a67af12ebbe7679738c2ee14cb18dfa.tar.bz2 mpv-8d8edc990a67af12ebbe7679738c2ee14cb18dfa.tar.xz | |
Simplify demux_ty_FindESHeader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ty.c')
| -rw-r--r-- | libmpdemux/demux_ty.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index f9ec223ae9..12525887b2 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -359,22 +359,17 @@ static void demux_ty_CopyToDemuxPacket( int type, TiVoInfo *tivo, demux_stream_t tivo->firstAudioPTS = pts; } -static int demux_ty_FindESHeader( unsigned char *header, int headerSize, - unsigned char *buffer, int bufferSize, int *esOffset1 ) +static int demux_ty_FindESHeader( unsigned char *header, + unsigned char *buffer, int bufferSize ) { int count; - - *esOffset1 = -1; for( count = 0 ; count < bufferSize ; count++ ) { if ( buffer[ count + 0 ] == header[ 0 ] && buffer[ count + 1 ] == header[ 1 ] && buffer[ count + 2 ] == header[ 2 ] && buffer[ count + 3 ] == header[ 3 ] ) - { - *esOffset1 = count; - return 1; - } + return count; } return -1; } @@ -652,8 +647,8 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) } printf( "\n" ); #endif - demux_ty_FindESHeader( ty_VideoPacket, 4, &chunk[ offset ], - size, &esOffset1 ); + esOffset1 = demux_ty_FindESHeader( ty_VideoPacket, &chunk[ offset ], + size); if ( esOffset1 != -1 ) tivo->lastVideoPTS = get_ty_pts( &chunk[ offset + esOffset1 + 9 ] ); @@ -745,8 +740,8 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) { int esOffset1, esOffset2; if ( nybbleType == 0x03 ) - demux_ty_FindESHeader( ty_MPEGAudioPacket, 4, &chunk[ offset ], - size, &esOffset1 ); + esOffset1 = demux_ty_FindESHeader( ty_MPEGAudioPacket, &chunk[ offset ], + size); // SA PES Header, No Audio Data // ================================================ |