[SCM] vlc/jessie: Remove patches included upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed May 4 18:02:08 UTC 2016


The following commit has been merged in the jessie branch:
commit 8bde315826eccd09703aa4b25457c7648abc80d8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 4 19:58:57 2016 +0200

    Remove patches included upstream

diff --git a/debian/patches/CVE-2015-5949.patch b/debian/patches/CVE-2015-5949.patch
deleted file mode 100644
index 49ba07e..0000000
--- a/debian/patches/CVE-2015-5949.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcartegnie at free.fr>
-Date: Mon, 3 Aug 2015 15:17:32 +0200
-Subject: [PATCH] demux: mp4: correctly match release function
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- modules/demux/mp4/libmp4.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
-index 331262b..f220e51 100644
---- a/modules/demux/mp4/libmp4.c
-+++ b/modules/demux/mp4/libmp4.c
-@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
-     {
-         for( i_index = 0; ; i_index++ )
-         {
-+            if ( MP4_Box_Function[i_index].i_parent &&
-+                 p_box->p_father &&
-+                 p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
-+                continue;
-+
-             if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
-                 ( MP4_Box_Function[i_index].i_type == 0 ) )
-             {
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2fbbdf3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-CVE-2015-5949.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list