[SCM] vlc/lucid: Refresh patch.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Wed Feb 9 23:11:07 UTC 2011


The following commit has been merged in the lucid branch:
commit f01c89487af635fc1964b3f4d0506d3b192aafb3
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Feb 10 00:01:54 2011 +0100

    Refresh patch.

diff --git a/debian/patches/mkv-input-validation.diff b/debian/patches/mkv-input-validation.diff
index 019dba3..9df102a 100644
--- a/debian/patches/mkv-input-validation.diff
+++ b/debian/patches/mkv-input-validation.diff
@@ -2,13 +2,11 @@ Subject: the ID could be OK but the class mismatching
 Author: Steve Lhomme <slhomme at matroska.org>
 Origin: upstream, http://git.videolan.org/gitweb.cgi?p=vlc/vlc-1.1.git;a=commit;h=3101bb7ac8abf56080d943806d666a385c3e9e33
 
-diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
-index 1461d4a..8e3ec9b 100644
 --- a/modules/demux/mkv/mkv.hpp
 +++ b/modules/demux/mkv/mkv.hpp
-@@ -119,7 +119,7 @@ extern "C" {
+@@ -130,7 +130,7 @@
+ #endif
  
- #define MKVD_TIMECODESCALE 1000000
  
 -#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
 +#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) )

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list