summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mf.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-07 20:22:44 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-07 20:22:44 +0000
commit15debd85d2181b75d1e2a1e0e0ffeed4b98f821f (patch)
treef7322d7d1585a290d33f0d83194e502a374b3061 /libmpdemux/demux_mf.c
parent5d1bccd70c0c9fd25c9d60fea303234ce2b609c9 (diff)
downloadmpv-15debd85d2181b75d1e2a1e0e0ffeed4b98f821f.tar.bz2
mpv-15debd85d2181b75d1e2a1e0e0ffeed4b98f821f.tar.xz
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mf.c')
-rw-r--r--libmpdemux/demux_mf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index 5139640faa..771101f3d2 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -15,7 +15,7 @@
#include "stheader.h"
#include "mf.h"
-static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags){
+static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
mf_t * mf = (mf_t *)demuxer->priv;
sh_video_t * sh_video = demuxer->video->sh;
int newpos = (flags & 1)?0:mf->curr_frame;