diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-20 10:47:58 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-16 04:14:01 +0200 |
| commit | da15a4de00470657eb44bb703448dab6dfaa448e (patch) | |
| tree | 6faef614cf8edf9a7493e16e40650dedd12428de | |
| parent | 8ffe2c9afe82366c08d4bb21849dec17eccdf949 (diff) | |
| download | mpv-da15a4de00470657eb44bb703448dab6dfaa448e.tar.bz2 mpv-da15a4de00470657eb44bb703448dab6dfaa448e.tar.xz | |
demux_ts: fix -sb 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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32635 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/demux_ts.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index da41f14c5a..3eb108913a 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -1065,7 +1065,9 @@ static demuxer_t *demux_open_ts(demuxer_t * 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); |