Mercurial > mplayer.hg

changeset 24507:e28f9913f48a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid one more code duplication
author reimar
date Sat, 15 Sep 2007 13:25:56 +0000
parents 1639f5402540
children 4f9b7524f65d
files libmpdemux/demux_ty.c
diffstat 1 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_ty.c	Sat Sep 15 12:13:45 2007 +0000
+++ b/libmpdemux/demux_ty.c	Sat Sep 15 13:25:56 2007 +0000
@@ -465,6 +465,7 @@
          return 0;
    }
 
+   do {
    if ( tivo->tmf != 1 )
    {
       // Make sure we are on a 128k boundary
@@ -489,25 +490,10 @@
          return 0;
       tivo->whichChunk++;
    }
-
-   // We found a part header, skip it
-   if( AV_RB32(chunk) == TIVO_PES_FILEID )
-   {
+   if (AV_RB32(chunk) == TIVO_PES_FILEID)
       mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Skipping PART Header\n" );
-      if ( tivo->tmf != 1 )
-      {
-         demux->filepos = stream_tell( demux->stream );
-         readSize = stream_read( demux->stream, chunk, CHUNKSIZE );
-      }
-      else
-      {
-         readSize = tmf_load_chunk( demux, tivo, chunk, tivo->whichChunk );
-         tivo->whichChunk++;
-      }
+   } while (AV_RB32(chunk) == TIVO_PES_FILEID);
 
-      if ( readSize != CHUNKSIZE )
-         return 0;
-   }
    mp_msg( MSGT_DEMUX, MSGL_DBG3,
       "\nty:actual current offset %"PRIx64"\n", stream_tell( demux->stream ) -
       CHUNKSIZE );