diff options
author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-20 09:36:10 +0000 |
---|---|---|
committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-20 09:36:10 +0000 |
commit | 6f446f41b599af7b4630d6e3ca0bc7285d7c8a62 (patch) | |
tree | 06724f51ed9368c59f78b092579b3afc755e9b2a /mencoder.c | |
parent | 362b6d13dd77b1f8d61e5436b96fa0ea51eb27ca (diff) | |
download | mpv-6f446f41b599af7b4630d6e3ca0bc7285d7c8a62.tar.bz2 mpv-6f446f41b599af7b4630d6e3ca0bc7285d7c8a62.tar.xz |
New option: -ignore-start
Makes mplayer and mencoder ignore dwStart in AVI files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index 167f5567a2..fb5e9fb489 100644 --- a/mencoder.c +++ b/mencoder.c @@ -156,6 +156,7 @@ static float c_total=0; 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 @@ if ((force_fourcc != NULL) && (strlen(force_fourcc) >= 4)) 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 @@ case ACODEC_COPY: if (verbose>1) print_wave_header(mux_a->wf); +if (! ignore_start) muxer->audio_delay_fix += sh_audio->stream_delay; } // if(sh_audio) |