From d1bb1bf8af7ef483ce745459e15693e87671618d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 21 Jul 2014 19:28:18 +0200
Subject: demux: fix timestamp type for seek calls

mpv/mplayer2/MPlayer use double for timestamps, but the demuxer API used
float.
---
 demux/demux.h           | 2 +-
 demux/demux_disc.c      | 2 +-
 demux/demux_lavf.c      | 2 +-
 demux/demux_mf.c        | 2 +-
 demux/demux_mkv.c       | 2 +-
 demux/demux_raw.c       | 2 +-
 demux/demux_subreader.c | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'demux')

diff --git a/demux/demux.h b/demux/demux.h
index d4d7a741e2..701c353189 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -114,7 +114,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, int flags);
+    void (*seek)(struct demuxer *demuxer, double rel_seek_secs, int flags);
     int (*control)(struct demuxer *demuxer, int cmd, void *arg);
 } demuxer_desc_t;
 
diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index 137ec6e1fa..b3d4db30a8 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -153,7 +153,7 @@ static void add_streams(demuxer_t *demuxer)
     reselect_streams(demuxer);
 }
 
-static void d_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
+static void d_seek(demuxer_t *demuxer, double rel_seek_secs, int flags)
 {
     struct priv *p = demuxer->priv;
 
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index cb0277a242..9a44e9ac35 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -822,7 +822,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
     return 1;
 }
 
-static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags)
+static void demux_seek_lavf(demuxer_t *demuxer, double rel_seek_secs, int flags)
 {
     lavf_priv_t *priv = demuxer->priv;
     int avsflags = 0;
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 721d99cf4d..3ce4ae5008 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -37,7 +37,7 @@
 
 #define MF_MAX_FILE_SIZE (1024 * 1024 * 256)
 
-static void demux_seek_mf(demuxer_t *demuxer, float rel_seek_secs, int flags)
+static void demux_seek_mf(demuxer_t *demuxer, double rel_seek_secs, int flags)
 {
     mf_t *mf = 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 7020825938..dff08ec894 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2706,7 +2706,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, int flags)
+static void demux_mkv_seek(demuxer_t *demuxer, double 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_raw.c b/demux/demux_raw.c
index 57d93e6b49..4388900ce6 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -237,7 +237,7 @@ static int raw_fill_buffer(demuxer_t *demuxer)
     return 1;
 }
 
-static void raw_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
+static void raw_seek(demuxer_t *demuxer, double 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 0fb23c22d3..f6454aaf2e 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -119,7 +119,7 @@ static double demux_packet_list_duration(struct demux_packet **pkts, int num_pkt
 }
 
 static void demux_packet_list_seek(struct demux_packet **pkts, int num_pkts,
-                                   int *current, float rel_seek_secs, int flags)
+                                   int *current, double rel_seek_secs, int flags)
 {
     double ref_time = 0;
     if (*current >= 0 && *current < num_pkts) {
@@ -803,7 +803,7 @@ static int d_fill_buffer(struct demuxer *demuxer)
     return demux_add_packet(p->sh, dp);
 }
 
-static void d_seek(struct demuxer *demuxer, float secs, int flags)
+static void d_seek(struct demuxer *demuxer, double secs, int flags)
 {
     struct priv *p = demuxer->priv;
     demux_packet_list_seek(p->pkts, p->num_pkts, &p->current, secs, flags);
-- 
cgit v1.2.3