[MPlayer-cvslog] r32635 - trunk/libmpdemux/demux_ts.c

[reimar]

Author: reimar
Date: Sat Nov 20 11:47:58 2010
New Revision: 32635

Log:
Fix TS demuxer with -sb and when -aid stream is not found.
Make it seek back to the stream->start_pos position instead of 0 in that case.
Fixes bug 1790.

Modified:
   trunk/libmpdemux/demux_ts.c

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Thu Nov 18 21:20:39 2010	(r32634)
+++ trunk/libmpdemux/demux_ts.c	Sat Nov 20 11:47:58 2010	(r32635)
@@ -1063,7 +1063,9 @@ static demuxer_t *demux_open_ts(demuxer_
 	mp_msg(MSGT_DEMUXER,MSGL_V, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...POS=%"PRIu64", PROBE=%"PRIu64"\n", params.atype, demuxer->audio->id, params.vtype, demuxer->video->id, (uint64_t) start_pos, ts_probe);
 
 
-	start_pos = (start_pos <= priv->ts.packet_size ? 0 : start_pos - priv->ts.packet_size);
+	start_pos = start_pos <= priv->ts.packet_size ?
+                    demuxer->stream->start_pos :
+                    start_pos - priv->ts.packet_size;
 	demuxer->movi_start = start_pos;
 	demuxer->reference_clock = MP_NOPTS_VALUE;
 	stream_reset(demuxer->stream);