summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-22 19:13:29 +0200
committerwm4 <wm4@nowhere>2013-08-22 19:14:26 +0200
commit1e649f353b159327b67722360cb080354d98230c (patch)
treee28756938750f11cd6c4fa615dedcad13520e908 /demux
parentbc0abebe8e7baa3c0a725bdfe8f14a1236dd2d55 (diff)
downloadmpv-1e649f353b159327b67722360cb080354d98230c.tar.bz2
mpv-1e649f353b159327b67722360cb080354d98230c.tar.xz
demux: remove unused audio_delay parameter from demux_seek()
Used to be needed by demux_avi.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.c5
-rw-r--r--demux/demux.h6
-rw-r--r--demux/demux_lavf.c7
-rw-r--r--demux/demux_mf.c3
-rw-r--r--demux/demux_mkv.c3
-rw-r--r--demux/demux_mng.c3
-rw-r--r--demux/demux_raw.c3
-rw-r--r--demux/demux_subreader.c3
8 files changed, 13 insertions, 20 deletions
diff --git a/demux/demux.c b/demux/demux.c
index ff59ef4250..272b089871 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -624,8 +624,7 @@ void demux_flush(demuxer_t *demuxer)
demuxer->warned_queue_overflow = false;
}
-int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
- int flags)
+int demux_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
{
if (!demuxer->seekable) {
mp_tmsg(MSGT_SEEK, MSGL_WARN, "Cannot seek in this file.\n");
@@ -672,7 +671,7 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
dmx_seek:
if (demuxer->desc->seek)
- demuxer->desc->seek(demuxer, rel_seek_secs, audio_delay, flags);
+ demuxer->desc->seek(demuxer, rel_seek_secs, flags);
return 1;
}
diff --git a/demux/demux.h b/demux/demux.h
index 9337b76100..06bf65809b 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -107,8 +107,7 @@ typedef struct demuxer_desc {
// The following functions are all optional
int (*fill_buffer)(struct demuxer *demuxer); // 0 on EOF, otherwise 1
void (*close)(struct demuxer *demuxer);
- void (*seek)(struct demuxer *demuxer, float rel_seek_secs,
- float audio_delay, int flags);
+ void (*seek)(struct demuxer *demuxer, float rel_seek_secs, int flags);
int (*control)(struct demuxer *demuxer, int cmd, void *arg);
} demuxer_desc_t;
@@ -222,8 +221,7 @@ struct demuxer *demux_open(struct stream *stream, char *force_format,
struct demuxer_params *params, struct MPOpts *opts);
void demux_flush(struct demuxer *demuxer);
-int demux_seek(struct demuxer *demuxer, float rel_seek_secs, float audio_delay,
- int flags);
+int demux_seek(struct demuxer *demuxer, float rel_seek_secs, int flags);
int demux_info_add(struct demuxer *demuxer, const char *opt, const char *param);
int demux_info_add_bstr(struct demuxer *demuxer, struct bstr opt,
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 4a9d127974..659dcacb7d 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -804,13 +804,12 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
return 1;
}
-static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs,
- float audio_delay, int flags)
+static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags)
{
lavf_priv_t *priv = demuxer->priv;
int avsflags = 0;
- mp_msg(MSGT_DEMUX, MSGL_DBG2, "demux_seek_lavf(%p, %f, %f, %d)\n",
- demuxer, rel_seek_secs, audio_delay, flags);
+ mp_msg(MSGT_DEMUX, MSGL_DBG2, "demux_seek_lavf(%p, %f, %d)\n",
+ demuxer, rel_seek_secs, flags);
seek_reset(demuxer);
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 9c2f8fb19c..0d7b2ece8a 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -47,7 +47,8 @@ static void free_mf(mf_t *mf)
}
}
-static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
+static void demux_seek_mf(demuxer_t *demuxer, float rel_seek_secs, int flags)
+{
mf_t * mf = (mf_t *)demuxer->priv;
int newpos = (flags & SEEK_ABSOLUTE)?0:mf->curr_frame - 1;
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 8d157d2ee7..be356585e3 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2577,8 +2577,7 @@ static struct mkv_index *seek_with_cues(struct demuxer *demuxer, int seek_id,
return index;
}
-static void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs,
- float audio_delay, int flags)
+static void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
{
mkv_demuxer_t *mkv_d = demuxer->priv;
int64_t old_pos = stream_tell(demuxer->stream);
diff --git a/demux/demux_mng.c b/demux/demux_mng.c
index 1342e51469..f408687c1b 100644
--- a/demux/demux_mng.c
+++ b/demux/demux_mng.c
@@ -457,8 +457,7 @@ static void demux_mng_close(demuxer_t* demuxer)
* \param[in] audio_delay unused, MNG does not contain audio
* \param[in] flags bit flags, \p 1: absolute, \p 2: fractional position
*/
-static void demux_mng_seek(demuxer_t * demuxer, float rel_seek_secs,
- float audio_delay, int flags)
+static void demux_mng_seek(demuxer_t * demuxer, float rel_seek_secs, int flags)
{
mng_priv_t * mng_priv = demuxer->priv;
mng_handle h_mng = mng_priv->h_mng;
diff --git a/demux/demux_raw.c b/demux/demux_raw.c
index c00723a290..9e4822ae79 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -217,8 +217,7 @@ static int raw_fill_buffer(demuxer_t *demuxer)
return 1;
}
-static void raw_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
- int flags)
+static void raw_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
{
struct priv *p = demuxer->priv;
stream_t *s = demuxer->stream;
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index ce7e779f5b..cc02e61595 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -1369,8 +1369,7 @@ static int d_fill_buffer(struct demuxer *demuxer)
return demuxer_add_packet(demuxer, p->sh, dp);
}
-static void d_seek(struct demuxer *demuxer, float secs, float audio_delay,
- int flags)
+static void d_seek(struct demuxer *demuxer, float secs, int flags)
{
struct priv *p = demuxer->priv;
demux_packet_list_seek(p->pkts, p->num_pkts, &p->current, secs, flags);