Mercurial > mplayer.hg

changeset 30396:5fe2615e5db7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Tue, 26 Jan 2010 21:08:01 +0000
parents 296ddce42cea
children 3e858991e23d
files libmpdemux/demuxer.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Tue Jan 26 18:19:57 2010 +0000
+++ b/libmpdemux/demuxer.c	Tue Jan 26 21:08:01 2010 +0000
@@ -1201,17 +1201,20 @@
     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);
     }
 }