summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-30 09:19:05 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-30 09:19:05 +0000
commit2912984517b5b4de5fa4e11bbf5365419b8d3cf1 (patch)
treecf0fd85b06466dc1932deb134fa19e13db988f9f /libmpdemux/demux_mkv.c
parent9e15dfe7fce6053d8851a6cf031b26a3018dc242 (diff)
downloadmpv-2912984517b5b4de5fa4e11bbf5365419b8d3cf1.tar.bz2
mpv-2912984517b5b4de5fa4e11bbf5365419b8d3cf1.tar.xz
move resync_audio_stream after seeking to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 74a8519317..bafbe7b9c8 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -3117,7 +3117,6 @@ demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, int flags)
free_cached_dps (demuxer);
if (!(flags & 2)) /* time in secs */
{
- void resync_audio_stream(sh_audio_t *sh_audio);
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
stream_t *s = demuxer->stream;
int64_t target_timecode = 0, diff, min_diff=0xFFFFFFFL;
@@ -3228,15 +3227,11 @@ demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, int flags)
clear_subtitles(demuxer, 0, 1);
demux_mkv_fill_buffer(demuxer, NULL);
-
- if(demuxer->audio->sh != NULL)
- resync_audio_stream((sh_audio_t *) demuxer->audio->sh);
}
else if ((demuxer->movi_end <= 0) || !(flags & 1))
mp_msg (MSGT_DEMUX, MSGL_V, "[mkv] seek unsupported flags\n");
else
{
- void resync_audio_stream(sh_audio_t *sh_audio);
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
stream_t *s = demuxer->stream;
uint64_t target_filepos;
@@ -3274,9 +3269,6 @@ demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, int flags)
clear_subtitles(demuxer, 0, 1);
demux_mkv_fill_buffer(demuxer, NULL);
-
- if(demuxer->audio->sh != NULL)
- resync_audio_stream((sh_audio_t *) demuxer->audio->sh);
}
}