3 files changed, 15 insertions, 7 deletions
diff --git a/stream/cache.c b/stream/cache.c
index b1b3c9301f..6bd729c6fa 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -412,6 +412,7 @@ static bool control_needs_flush(int stream_ctrl)
 {
     switch (stream_ctrl) {
     case STREAM_CTRL_SEEK_TO_TIME:
+    case STREAM_CTRL_AVSEEK:
     case STREAM_CTRL_SET_ANGLE:
     case STREAM_CTRL_SET_CURRENT_TITLE:
         return true;
diff --git a/stream/stream.h b/stream/stream.h
index 344e8b55ef..2cd3d9f5fa 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -101,6 +101,7 @@ enum stream_ctrl {
     STREAM_CTRL_TV_LAST_CHAN,
     STREAM_CTRL_DVB_SET_CHANNEL,
     STREAM_CTRL_DVB_STEP_CHANNEL,
+    STREAM_CTRL_AVSEEK,
 };
 
 struct stream_lang_req {
@@ -120,6 +121,13 @@ struct stream_dvd_info_req {
 #define TV_COLOR_SATURATION     3
 #define TV_COLOR_CONTRAST       4
 
+// for STREAM_CTRL_AVSEEK
+struct stream_avseek {
+    int stream_index;
+    int64_t timestamp;
+    int flags;
+};
+
 struct stream;
 typedef struct stream_info_st {
     const char *name;
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index c736ade45f..8d8ceb3f94 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -101,8 +101,7 @@ static int control(stream_t *s, int cmd, void *arg)
     AVIOContext *avio = s->priv;
     if (!avio && cmd != STREAM_CTRL_RECONNECT)
         return -1;
-    int64_t size, ts;
-    double pts;
+    int64_t size;
     switch(cmd) {
     case STREAM_CTRL_GET_SIZE:
         size = avio_size(avio);
@@ -111,13 +110,13 @@ static int control(stream_t *s, int cmd, void *arg)
             return 1;
         }
         break;
-    case STREAM_CTRL_SEEK_TO_TIME:
-        pts = *(double *)arg;
-        ts = pts * AV_TIME_BASE;
-        ts = avio_seek_time(avio, -1, ts, 0);
-        if (ts >= 0)
+    case STREAM_CTRL_AVSEEK: {
+        struct stream_avseek *c = arg;
+        int64_t r = avio_seek_time(avio, c->stream_index, c->timestamp, c->flags);
+        if (r >= 0)
             return 1;
         break;
+    }
     case STREAM_CTRL_GET_METADATA: {
         *(struct mp_tags **)arg = read_icy(s);
         if (!*(struct mp_tags **)arg)