[MPlayer-cvslog] r22370 - in trunk/libmpdemux: demux_mpg.c demux_ts.c

[nicodvb]

Author: nicodvb
Date: Tue Feb 27 21:22:05 2007
New Revision: 22370

Modified:
   trunk/libmpdemux/demux_mpg.c
   trunk/libmpdemux/demux_ts.c

Log:
removed duplicated code in demux_seek(); stream_seek() already aligns to STREAM_BUFFER_SIZE boundary

Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c	(original)
+++ trunk/libmpdemux/demux_mpg.c	Tue Feb 27 21:22:05 2007
@@ -892,11 +892,6 @@ void demux_seek_mpg(demuxer_t *demuxer,f
 	    if(newpos<demuxer->movi_start) newpos=demuxer->movi_start;
 	}
 
-#ifdef _LARGEFILE_SOURCE
-        newpos&=~((long long)STREAM_BUFFER_SIZE-1);  /* sector boundary */
-#else
-        newpos&=~(STREAM_BUFFER_SIZE-1);  /* sector boundary */
-#endif
         stream_seek(demuxer->stream,newpos);
 
         // re-sync video:

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	(original)
+++ trunk/libmpdemux/demux_ts.c	Tue Feb 27 21:22:05 2007
@@ -3111,12 +3111,6 @@ static void demux_seek_ts(demuxer_t *dem
 	if(newpos < demuxer->movi_start)
   		newpos = demuxer->movi_start;	//begininng of stream
 
-#ifdef _LARGEFILE_SOURCE
-	newpos &= ~((long long) (STREAM_BUFFER_SIZE - 1));  /* sector boundary */
-#else
-	newpos &= ~(STREAM_BUFFER_SIZE - 1);  /* sector boundary */
-#endif
-
 	stream_seek(demuxer->stream, newpos);
 	for(i = 0; i < 8192; i++)
 		if(priv->ts.pids[i] != NULL)