# HG changeset patch # User reimar # Date 1264540081 0 # Node ID 5fe2615e5db70a302515482072f4149fa7d59648 # Parent 296ddce42cea33d5286f0a4de345745c31d0eed2 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. diff -r 296ddce42cea -r 5fe2615e5db7 libmpdemux/demuxer.c --- 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); } }