[vlc-commits] demux: mkv: revert ab042aa7a8befcf9fe80b5f46fb5320bfe7a0230

Filip Roséen git at videolan.org
Fri Jul 27 10:44:41 CEST 2018


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

demux: mkv: revert ab042aa7a8befcf9fe80b5f46fb5320bfe7a0230

The changes introduced by the commit in question are redundant; if
demuxer_sys_t::b_seekable is false we never execute the added lines.

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

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

 modules/demux/mkv/demux.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 225bf00337..7909973ba2 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -132,10 +132,7 @@ bool demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, matroska_stream_c *
 
         EbmlElement* p_l0_prev = p_l0;
 
-        bool b_seekable;
-        vlc_stream_Control( demuxer.s, STREAM_CAN_SEEK, &b_seekable );
-
-        if (p_l0->IsFiniteSize() && b_seekable )
+        if (p_l0->IsFiniteSize() )
         {
             p_l0->SkipData(p_stream1->estream, KaxMatroska_Context);
             p_l0 = p_stream1->estream.FindNextID(EBML_INFO(KaxSegment), UINT64_MAX);



More information about the vlc-commits mailing list