summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-18 09:26:39 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-18 09:26:39 +0000
commitb4e5108496a53bdbb673a35aed6a9ca3114c031b (patch)
tree839a8f181b3ed2b7e8a8c6ba5db870ee5652b965 /mplayer.c
parent366151d7419c64ab24268134c07a4b712b61efa7 (diff)
downloadmpv-b4e5108496a53bdbb673a35aed6a9ca3114c031b.tar.bz2
mpv-b4e5108496a53bdbb673a35aed6a9ca3114c031b.tar.xz
dwStart support for mplayer.
* demux_avi sets stream_delay according to dwStart * mplayer adjusts audio_delay according to stream_delay 3 related patches are pending, and I will apply them over the next few days if all goes well. As I mentioned on -dev-eng, the funny indentation is in preparation for one of those pending patches. See: Date: Fri, 17 Feb 2006 00:53:28 -0800 To: mplayer-dev-eng@mplayerhq.hu Subject: [PATCH] bframes, dwStart: individual patches git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17644 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index a0ecc2f0e6..a39f7fa072 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2522,8 +2522,14 @@ if(sh_audio){
current_module="av_init";
-if(sh_video) sh_video->timer=0;
-if(sh_audio) sh_audio->delay=-audio_delay;
+if(sh_video){
+ sh_video->timer=0;
+ audio_delay += sh_video->stream_delay;
+}
+if(sh_audio){
+ audio_delay -= sh_audio->stream_delay;
+ sh_audio->delay=-audio_delay;
+}
if(!sh_audio){
mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);