[vlc-commits] demux: mkv: !b_seekable implies b_fastseekable = false

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Tue Jul 17 06:37:25 2018 +0200| [f925055ca2e35a1164d04bf17afb2c2b9074b253] | committer: Steve Lhomme

demux: mkv: !b_seekable implies b_fastseekable = false

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f925055ca2e35a1164d04bf17afb2c2b9074b253
---

 modules/demux/mkv/mkv.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 415b9f5b51..07a8cb39c7 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -114,7 +114,8 @@ static int Open( vlc_object_t * p_this )
     p_demux->p_sys      = p_sys = new demux_sys_t( *p_demux );
 
     vlc_stream_Control( p_demux->s, STREAM_CAN_SEEK, &p_sys->b_seekable );
-    if ( vlc_stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &p_sys->b_fastseekable ) )
+    if ( !p_sys->b_seekable || vlc_stream_Control(
+          p_demux->s, STREAM_CAN_FASTSEEK, &p_sys->b_fastseekable ) )
         p_sys->b_fastseekable = false;
 
     es_out_Control( p_demux->out, ES_OUT_SET_ES_CAT_POLICY, VIDEO_ES,