[vlc-commits] Don't treat truncated files as invalid

Denis Charmet git at videolan.org
Wed Feb 8 23:54:22 CET 2012


vlc/vlc-2.0 | branch: master | Denis Charmet <typx at dinauz.org> | Wed Feb  8 23:30:44 2012 +0100| [e27556b4506e8eb7f7f17eb55a3aa860ba227d48] | committer: Jean-Baptiste Kempf

Don't treat truncated files as invalid

Fix a regression introduced by c8b78f40656

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 1e95ac231d3849360466bc273f4f608211b61ab9)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mkv/demux.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 0bcc0bc..f63d352 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -464,7 +464,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
 
     // verify the EBML Header
     vlc_stream_io_callback & io_stream = (vlc_stream_io_callback &) p_estream->I_O();
-    p_l0 = p_estream->FindNextID(EBML_INFO(EbmlHead), io_stream.toRead());
+    p_l0 = p_estream->FindNextID(EBML_INFO(EbmlHead), UINT64_MAX);
     if (p_l0 == NULL)
     {
         msg_Err( p_demux, "No EBML header found" );
@@ -492,7 +492,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
 
 
     // find all segments in this file
-    p_l0 = p_estream->FindNextID(EBML_INFO(KaxSegment), io_stream.toRead());
+    p_l0 = p_estream->FindNextID(EBML_INFO(KaxSegment), UINT64_MAX);
     if (p_l0 == NULL)
     {
         return NULL;
@@ -566,7 +566,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS
         if (p_l0->IsFiniteSize() )
         {
             p_l0->SkipData(*p_estream, KaxMatroska_Context);
-            p_l0 = p_estream->FindNextID(EBML_INFO(KaxSegment), io_stream.toRead());
+            p_l0 = p_estream->FindNextID(EBML_INFO(KaxSegment), UINT64_MAX);
         }
         else
         {



More information about the vlc-commits mailing list