Mercurial > mplayer.hg

changeset 24476:b42dd327f81f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Another piece of duplicate code
author reimar
date Fri, 14 Sep 2007 19:34:17 +0000
parents 7e10a426b257
children 8c9d86adb28e
files libmpdemux/demux_ty.c
diffstat 1 files changed, 2 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_ty.c	Fri Sep 14 19:30:25 2007 +0000
+++ b/libmpdemux/demux_ty.c	Fri Sep 14 19:34:17 2007 +0000
@@ -733,9 +733,9 @@
 
             // 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 @@
                }
             }
 
-            // 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