packages: vlc/vlc-mkv.patch - adjust for release

[baggins]

Author: baggins                      Date: Mon Feb 28 12:31:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust for release

---- Files affected:
packages/vlc:
   vlc-mkv.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/vlc/vlc-mkv.patch
diff -u packages/vlc/vlc-mkv.patch:1.1 packages/vlc/vlc-mkv.patch:1.2
--- packages/vlc/vlc-mkv.patch:1.1	Mon Feb 28 13:18:04 2011
+++ packages/vlc/vlc-mkv.patch	Mon Feb 28 13:31:02 2011
@@ -14,21 +14,21 @@
 --- a/modules/demux/mkv/matroska_segment.cpp
 +++ b/modules/demux/mkv/matroska_segment.cpp
 @@ -267,6 +267,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
-             {
-                 if( MKV_IS_ID( el, KaxTagTargets ) )
-                     PARSE_TAG( "Targets" );
+                     }
+                     ep->Up();
+                 }
 +#if 0 // not valid anymore
                  else if( MKV_IS_ID( el, KaxTagGeneral ) )
-                     PARSE_TAG( "General" );
-                 else if( MKV_IS_ID( el, KaxTagGenres ) )
+                 {
+                     msg_Dbg( &sys.demuxer, "|   + General" );
 @@ -303,6 +304,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
                  {
                      msg_Dbg( &sys.demuxer, "|   + Multi Title" );
                  }
 +#endif
-                 else if( MKV_IS_ID( el, KaxTagSimple ) )
-                     ParseSimpleTags( static_cast<KaxTagSimple*>( el ) );
                  else
+                 {
+                     msg_Dbg( &sys.demuxer, "|   + LoadTag Unknown (%s)", typeid( *el ).name() );
 diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
 index 664cafa..c7b6194 100644
 --- a/modules/demux/mkv/mkv.hpp
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc-mkv.patch?r1=1.1&r2=1.2&f=u