[MPlayer-cvslog] r30438 - trunk/libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Tue Jan 26 22:08:01 2010
New Revision: 30438

Log:
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.

Modified:
   trunk/libmpdemux/demuxer.c

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Tue Jan 26 19:19:57 2010	(r30437)
+++ trunk/libmpdemux/demuxer.c	Tue Jan 26 22:08:01 2010	(r30438)
@@ -1201,17 +1201,20 @@ demuxer_t *demux_open(stream_t *vs, int 
     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);
     }
 }