Another piece of duplicate code

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24496 b3059339-0415-0410-9bf9-f77b7e298cf2

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