]> git.pld-linux.org Git - packages/vlc.git/commitdiff
- obsolete in 1.1.8
authorBartłomiej Zimoń <cactus@pld-linux.org>
Thu, 31 Mar 2011 13:50:37 +0000 (13:50 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    vlc-mkv.patch -> 1.3

vlc-mkv.patch [deleted file]

diff --git a/vlc-mkv.patch b/vlc-mkv.patch
deleted file mode 100644 (file)
index a0c4156..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7be936ca451fa0c052069895460dcc0e67f4dfa3 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@robux4-desktop.(none)>
-Date: Fri, 28 Jan 2011 18:57:50 +0100
-Subject: [PATCH] MKV: Multi tags don't exist anymore
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/demux/mkv/matroska_segment.cpp |    2 ++
- modules/demux/mkv/mkv.hpp              |    2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
-index 2856b93..fac4f45 100644
---- 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 )
-                     }
-                     ep->Up();
-                 }
-+#if 0 // not valid anymore
-                 else if( MKV_IS_ID( el, KaxTagGeneral ) )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + General" );
-@@ -303,6 +304,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + Multi Title" );
-                 }
-+#endif
-                 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
-+++ b/modules/demux/mkv/mkv.hpp
-@@ -86,7 +86,7 @@
- #include "matroska/KaxSegment.h"
- #include "matroska/KaxTag.h"
- #include "matroska/KaxTags.h"
--#include "matroska/KaxTagMulti.h"
-+//#include "matroska/KaxTagMulti.h"
- #include "matroska/KaxTracks.h"
- #include "matroska/KaxTrackAudio.h"
- #include "matroska/KaxTrackVideo.h"
--- 
-1.6.5.GIT
-
This page took 0.102603 seconds and 4 git commands to generate.