Mercurial > mplayer.hg

diff mencoder.c @ 17654:16633b9c0953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New option: -ignore-start Makes mplayer and mencoder ignore dwStart in AVI files.
author corey
date Mon, 20 Feb 2006 09:36:10 +0000
parents 5963b50c2178
children 92ac78a93625
line wrap: on
line diff
--- a/mencoder.c	Mon Feb 20 04:49:06 2006 +0000
+++ b/mencoder.c	Mon Feb 20 09:36:10 2006 +0000
@@ -156,6 +156,7 @@
 static float audio_preload=0.5;
 static float audio_delay_fix=0.0;
 static float audio_delay=0.0;
+static int ignore_start=0;
 static int audio_density=2;
 
 float force_fps=0;
@@ -866,6 +867,7 @@
 	mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression);
 }
 
+if (! ignore_start)
     muxer->audio_delay_fix -= sh_video->stream_delay;
 
 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
@@ -961,6 +963,7 @@
 
 if (verbose>1) print_wave_header(mux_a->wf);
 
+if (! ignore_start)
     muxer->audio_delay_fix += sh_audio->stream_delay;
 
 } // if(sh_audio)