diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 19:34:17 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 19:34:17 +0000 |
| commit | 15940ebaff8b66ad7433577d6763d59e87962993 (patch) | |
| tree | f6f6851f0a73e0715d93ca454f51e75b5b465d82 /libmpdemux | |
| parent | 7d7cfea105792f3e963b8dc41a1549f96d63fc57 (diff) | |
| download | mpv-15940ebaff8b66ad7433577d6763d59e87962993.tar.bz2 mpv-15940ebaff8b66ad7433577d6763d59e87962993.tar.xz | |
Another piece of duplicate code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24496 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ty.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 2bfa7a7515..f972214347 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -733,9 +733,9 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) // SA DTiVo Audio Data, no PES // ================================================ - if ( nybbleType == 0x02 ) + if ( nybbleType == 0x02 || nybbleType == 0x04 ) { - if ( tivo->tivoType == 2 ) + if ( nybbleType == 0x02 && tivo->tivoType == 2 ) demux_ty_AddToAudioBuffer( tivo, &chunk[ offset ], size ); else { @@ -815,17 +815,6 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) } } - // SA Audio with no PES Header - // ================================================ - if ( nybbleType == 0x04 ) - { - mp_msg( MSGT_DEMUX, MSGL_DBG3, - "ty:Adding Audio Packet Size %d\n", size ); - demux_ty_CopyToDemuxPacket( TY_A, tivo, demux->audio, - &chunk[ offset ], size, ( demux->filepos + offset ), - tivo->lastAudioPTS ); - } - offset += size; } else |