From 71e73b6c8ead34219eb6d16ede74d161f847826c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 29 Oct 2014 22:45:21 +0100
Subject: demux: move some seek flag sanitation to generic code

No reason why only demux_mkv.c should do this.
---
 demux/demux.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 01c03026f7..d8ebde7384 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -963,9 +963,22 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
         return 0;
     }
 
+    if ((flags & SEEK_FACTOR) && !(flags & SEEK_ABSOLUTE)) {
+        MP_WARN(demuxer, "Invalid seek flags.\n");
+        return 0;
+    }
+
     if (rel_seek_secs == MP_NOPTS_VALUE && (flags & SEEK_ABSOLUTE))
         return 0;
 
+    if (!(flags & (SEEK_BACKWARD | SEEK_FORWARD))) {
+        if (flags & SEEK_ABSOLUTE || rel_seek_secs < 0) {
+            flags |= SEEK_BACKWARD;
+        } else {
+            flags |= SEEK_FORWARD;
+        }
+    }
+
     pthread_mutex_lock(&in->lock);
 
     flush_locked(demuxer);
-- 
cgit v1.2.3