From 544a3061472e1a3590a26fbcc2de72ecb03134fb Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 15 Sep 2007 13:25:56 +0000
Subject: Avoid one more code duplication

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24527 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_ty.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'libmpdemux/demux_ty.c')

diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index b219af7b3f..38f5b1877b 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -465,6 +465,7 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
          return 0;
    }
 
+   do {
    if ( tivo->tmf != 1 )
    {
       // Make sure we are on a 128k boundary
@@ -489,25 +490,10 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
          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 );
-- 
cgit v1.2.3