summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-26 21:08:01 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-26 21:08:01 +0000
commitcc95355a0a4d88306e4af0323818e694718a8e8e (patch)
tree138e2ceccd59bc34267fa954542032a700ebc41a /libmpdemux/demuxer.c
parentb1f3c590c79534efb970220d4c186063adb225aa (diff)
downloadmpv-cc95355a0a4d88306e4af0323818e694718a8e8e.tar.bz2
mpv-cc95355a0a4d88306e4af0323818e694718a8e8e.tar.xz
Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
the ASF demuxer (seek seems to end up right after the keyframe?) and seem to have no purpose anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30438 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 15960c9ae3..5d4798470a 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -1201,17 +1201,20 @@ demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id,
return res;
}
+/**
+ * Do necessary reinitialization after e.g. a seek.
+ * Do _not_ call ds_fill_buffer between the seek and this, it breaks at least
+ * seeking with ASF demuxer.
+ */
static void demux_resync(demuxer_t *demuxer)
{
sh_video_t *sh_video = demuxer->video->sh;
sh_audio_t *sh_audio = demuxer->audio->sh;
demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
if (sh_video) {
- ds_fill_buffer(demuxer->video);
resync_video_stream(sh_video);
}
if (sh_audio) {
- ds_fill_buffer(demuxer->audio);
resync_audio_stream(sh_audio);
}
}