summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 19:39:51 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 19:39:51 +0000
commit3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b (patch)
treed94b1f77ca0deeb3115fb510ebd09d19fa2f59b0 /libmpdemux/demuxer.c
parentc9cf174b9cf43ca1efb0911698e7a17ddb81d96b (diff)
downloadmpv-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/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 181a16d3a6..8ff2fc747f 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -859,7 +859,7 @@ demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int
}
-int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
+int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
demux_stream_t *d_audio=demuxer->audio;
demux_stream_t *d_video=demuxer->video;
sh_audio_t *sh_audio=d_audio->sh;