[SCM] vlc/master: Removed, included upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jun 1 17:58:36 UTC 2016


The following commit has been merged in the master branch:
commit a3a6e036b8ad9a9452097ee871622e2f49969577
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 1 19:54:36 2016 +0200

    Removed, included upstream

diff --git a/debian/patches/g711-fix-dangling-pointer-fixes-16909.patch b/debian/patches/g711-fix-dangling-pointer-fixes-16909.patch
deleted file mode 100644
index 44f5130..0000000
--- a/debian/patches/g711-fix-dangling-pointer-fixes-16909.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 924a4a596ceba6a99f252f1efe7c048e830e6e8c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Wed, 4 May 2016 20:01:49 +0300
-Subject: [PATCH 1/2] g711: fix dangling pointer (fixes #16909)
-
----
- modules/codec/g711.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/codec/g711.c b/modules/codec/g711.c
-index 5d89471..ce5fb53 100644
---- a/modules/codec/g711.c
-+++ b/modules/codec/g711.c
-@@ -219,6 +219,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
-     if( pp_block == NULL )
-         return NULL;
-     block_t *p_block = *pp_block;
-+    *pp_block = NULL;
-     if( p_block == NULL )
-         return NULL;
- 
--- 
-2.8.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 5795426..c804643 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 fix-translation.patch
 drop-check-qt-check.patch
-the-Hurd-also-uses-the-.so-extension-for-libraries.patch
-Fix-Hurd-build.patch
-g711-fix-dangling-pointer-fixes-16909.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list