summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-01 09:33:23 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-01 09:33:23 +0000
commitc5cbf5efe60c93bcd82ee5cd4dc8b8008d4d3b53 (patch)
tree37af18d56087ac5938951c0922908a4b8f6be739 /libmpdemux
parent661eb52612df5c2b151e16512088ac64662eaa1a (diff)
downloadmpv-c5cbf5efe60c93bcd82ee5cd4dc8b8008d4d3b53.tar.bz2
mpv-c5cbf5efe60c93bcd82ee5cd4dc8b8008d4d3b53.tar.xz
Reset demuxer->sub (consistently with audio and video) after seeking and at the end
of demux_mpg_open() to prevent ghost packets. Patch by Olaf Mandel - olaf mandel name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20011 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mpg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index 773ac44f6a..7bae4f3f74 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -137,6 +137,7 @@ static demuxer_t* demux_mpg_open(demuxer_t* demuxer) {
}
ds_free_packs(demuxer->audio);
ds_free_packs(demuxer->video);
+ ds_free_packs(demuxer->sub);
demuxer->stream->eof=0; // clear eof flag
demuxer->video->eof=0;
demuxer->audio->eof=0;
@@ -791,6 +792,7 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in
newpos += (newpts - mpg_d->last_pts) * (newpos - oldpos) / (mpg_d->last_pts - oldpts);
ds_free_packs(d_audio);
ds_free_packs(d_video);
+ ds_free_packs(demuxer->sub);
demuxer->stream->eof=0; // clear eof flag
d_video->eof=0;
d_audio->eof=0;