[vlc-commits] demux: avi: fix seekability

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Jan  5 18:13:34 2018 +0100| [669a10f8c68c5e0262cfb8b893ed4d87d209239a] | committer: Francois Cartegnie

demux: avi: fix seekability

(cherry picked from commit 0e6ec7ab11d2c983aac08a52f53199728e986b77)

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

 modules/demux/avi/avi.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index d61776de25..4cc3882dcc 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -409,15 +409,18 @@ static int Open( vlc_object_t * p_this )
         p_demux->pf_demux = Demux_Seekable;
         p_sys->i_read_increment = READ_LENGTH;
     }
-    else if( p_sys->b_seekable && !p_sys->b_interleaved )
+    else if( p_sys->b_seekable )
     {
         p_demux->pf_demux = Demux_Seekable;
         p_sys->i_read_increment = READ_LENGTH_NONINTERLEAVED;
-        msg_Warn( p_demux, "Non seekable non interleaved content over slow seekable, "
-                           "expect bad performance" );
+        if( !p_sys->b_interleaved )
+            msg_Warn( p_demux, "Non interleaved content over slow seekable, "
+                               "expect bad performance" );
     }
     else
     {
+        msg_Warn( p_demux, "Non seekable content " );
+
         p_demux->pf_demux = Demux_UnSeekable;
         p_sys->i_read_increment = READ_LENGTH_NONINTERLEAVED;
          /* non seekable and non interleaved case ? well... */