[SCM] vlc/master: Upstream patch to fix issue with WAV files

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 69bedd0a2589c5bad149fb3e8381f6f31d1c9be3
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 4 19:47:58 2016 +0200

    Upstream patch to fix issue with WAV files

diff --git a/debian/patches/g711-fix-dangling-pointer-fixes-16909.patch b/debian/patches/g711-fix-dangling-pointer-fixes-16909.patch
new file mode 100644
index 0000000..44f5130
--- /dev/null
+++ b/debian/patches/g711-fix-dangling-pointer-fixes-16909.patch
@@ -0,0 +1,24 @@
+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 a579a2f..fa99ca3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ 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