From 9bb7935ce186d55aaaafd708e7559345082ecabc Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 8 Jul 2013 21:59:44 +0200
Subject: options: remove --ignore-start

This was used only with demux_avi.
---
 DOCS/man/en/options.rst | 5 -----
 core/mplayer.c          | 9 ---------
 core/options.c          | 3 ---
 core/options.h          | 1 -
 demux/stheader.h        | 3 ---
 5 files changed, 21 deletions(-)

diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 915602aaca..d891766f6b 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1044,11 +1044,6 @@
         This option only works if the underlying media supports seeking
         (i.e. not with stdin, pipe, etc).
 
-``--ignore-start``
-    Matters with the builtin AVI demuxer only, which is not enabled by default.
-    Ignore the specified starting time for streams in AVI files. This
-    nullifies stream delays.
-
 ``--include=<configuration-file>``
     Specify configuration file to be parsed after the default ones.
 
diff --git a/core/mplayer.c b/core/mplayer.c
index 019d37081d..bb6a87642e 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4298,15 +4298,6 @@ goto_reopen_demuxer: ;
 
     //================ SETUP STREAMS ==========================
 
-    if (mpctx->sh_video) {
-        if (!opts->ignore_start)
-            mpctx->audio_delay += mpctx->sh_video->stream_delay;
-    }
-    if (mpctx->sh_audio) {
-        if (!opts->ignore_start)
-            mpctx->audio_delay -= mpctx->sh_audio->stream_delay;
-    }
-
     if (opts->force_fps && mpctx->sh_video) {
         mpctx->sh_video->fps = opts->force_fps;
         mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps;
diff --git a/core/options.c b/core/options.c
index c0e64b0dcd..d676cb4948 100644
--- a/core/options.c
+++ b/core/options.c
@@ -430,9 +430,6 @@ const m_option_t mp_opts[] = {
     // set a-v distance
     OPT_FLOATRANGE("audio-delay", audio_delay, 0, -100.0, 100.0),
 
-    // ignore header-specified delay (dwStart)
-    OPT_FLAG("ignore-start", ignore_start, 0),
-
 // ------------------------- codec/vfilter options --------------------
 
     {"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
diff --git a/core/options.h b/core/options.h
index f7be4adb02..d46435bf9e 100644
--- a/core/options.h
+++ b/core/options.h
@@ -105,7 +105,6 @@ typedef struct MPOpts {
     float hr_seek_demuxer_offset;
     float audio_delay;
     float default_max_pts_correction;
-    int ignore_start;
     int autosync;
     int softsleep;
     int frame_dropping;
diff --git a/demux/stheader.h b/demux/stheader.h
index b2dc2018d2..628a2b73f2 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -78,9 +78,6 @@ struct sh_stream {
     /* usually a FourCC, exact meaning depends on gsh->format */        \
     unsigned int format;                                                \
     int initialized;                                                    \
-    /* number of seconds stream should be delayed                       \
-     * (according to dwStart or similar) */                             \
-    float stream_delay;                                                 \
     /* audio: last known pts value in output from decoder               \
      * video: predicted/interpolated PTS of the current frame */        \
     double pts;                                                         \
-- 
cgit v1.2.3