Another piece of duplicate code

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24496 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-09-14 19:34:17 +00:00
parent 7d7cfea105
commit 15940ebaff
1 changed files with 2 additions and 13 deletions

View File

@ -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