diff options
author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-09 19:39:51 +0000 |
---|---|---|
committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-09 19:39:51 +0000 |
commit | 3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b (patch) | |
tree | d94b1f77ca0deeb3115fb510ebd09d19fa2f59b0 /libmpdemux/demux_demuxers.c | |
parent | c9cf174b9cf43ca1efb0911698e7a17ddb81d96b (diff) | |
download | mpv-3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b.tar.bz2 mpv-3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b.tar.xz |
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_demuxers.c')
-rw-r--r-- | libmpdemux/demux_demuxers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index 092be8d505..a3e294a04c 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -57,7 +57,7 @@ static int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds) { return 0; } -static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags) { +static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags) { dd_priv_t* priv; float pos; priv=demuxer->priv; @@ -66,13 +66,13 @@ static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,float aud priv->sd->stream->eof = 0; // Seek video - demux_seek(priv->vd,rel_seek_secs,audio_delay,flags); + demux_seek(priv->vd,rel_seek_secs,flags); // Get the new pos pos = demuxer->video->pts; if(priv->ad != priv->vd) { sh_audio_t* sh = (sh_audio_t*)demuxer->audio->sh; - demux_seek(priv->ad,pos,audio_delay,1); + demux_seek(priv->ad,pos,1); // In case the demuxer don't set pts if(!demuxer->audio->pts) demuxer->audio->pts = pos-((ds_tell_pts(demuxer->audio)-sh->a_in_buffer_len)/(float)sh->i_bps); @@ -80,7 +80,7 @@ static void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,float aud } if(priv->sd != priv->vd) - demux_seek(priv->sd,pos,audio_delay,1); + demux_seek(priv->sd,pos,1); } |