[MPlayer-cvslog] CVS: main mplayer.c,1.908,1.909

[Corey Hickey CVS]

CVS change done by Corey Hickey CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv5707

Modified Files:
	mplayer.c 
Log Message:
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 at mplayerhq.hu
Subject: [PATCH] bframes, dwStart: individual patches


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- mplayer.c	17 Feb 2006 01:57:40 -0000	1.908
+++ mplayer.c	18 Feb 2006 09:26:39 -0000	1.909
@@ -2522,8 +2522,14 @@
 
 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);