[MPlayer-cvslog] r24496 - trunk/libmpdemux/demux_ty.c

[reimar]

Author: reimar
Date: Fri Sep 14 21:34:17 2007
New Revision: 24496

Log:
Another piece of duplicate code


Modified:
   trunk/libmpdemux/demux_ty.c

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	(original)
+++ trunk/libmpdemux/demux_ty.c	Fri Sep 14 21:34:17 2007
@@ -733,9 +733,9 @@ static int demux_ty_fill_buffer( demuxer
 
             // 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
                }
             }
 
-            // 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