[vlc-devel] commit: mkv: inital Cluster check. (Derk-Jan Hartman )

git version control git at videolan.org
Fri Aug 15 03:43:59 CEST 2008


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Fri Aug 15 03:46:04 2008 +0200| [775164eece0ea27fc0c6de3f6bd28f00aed58f23] | committer: Derk-Jan Hartman 

mkv: inital Cluster check.

The check was stupid (always was). This seems way more logical.

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

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

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index e3da4a7..bf127da 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -1496,10 +1496,8 @@ static int Open( vlc_object_t * p_this )
     p_segment = p_stream->segments[0];
     if( p_segment->cluster == NULL )
     {
-        msg_Warn( p_demux, "cannot find any cluster, damaged file ?" );
-
-        // reset the stream reading to the first cluster of the segment used
-        p_stream->p_in->setFilePointer( p_segment->cluster->GetElementPosition() );
+        msg_Err( p_demux, "cannot find any cluster, damaged file ?" );
+        goto error;
     }
 
     if (config_GetInt( p_demux, "mkv-preload-local-dir" ))




More information about the vlc-devel mailing list