RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-13 10:26:00 +00:00
Code Issues Releases Wiki Activity

Remove ds_fill_buffer calls from demux_resync, they cause issues at least with

Browse Source 
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
This commit is contained in:
reimar 2010-01-26 21:08:01 +00:00
parent b1f3c590c7
commit cc95355a0a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpdemux/demuxer.c
View File

@ -1201,17 +1201,20 @@ demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id,
return res; 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) static void demux_resync(demuxer_t *demuxer)
{ {
sh_video_t *sh_video = demuxer->video->sh; sh_video_t *sh_video = demuxer->video->sh;
sh_audio_t *sh_audio = demuxer->audio->sh; sh_audio_t *sh_audio = demuxer->audio->sh;
demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
if (sh_video) { if (sh_video) {
ds_fill_buffer(demuxer->video);
resync_video_stream(sh_video); resync_video_stream(sh_video);
} }
if (sh_audio) { if (sh_audio) {
ds_fill_buffer(demuxer->audio);
resync_audio_stream(sh_audio); resync_audio_stream(sh_audio);
} }
} }