git » vlc.git » commit d297c05

diff --git a/PKGBUILD b/PKGBUILD
index 80c007d..980c2d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=vlc
 pkgver=2.1.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -57,16 +57,19 @@ options=('!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
         'vlc-2.0.7-vaapi-compat.patch'
-        'vlc-2.1.5-ffmpeg-2.4.patch')
+        'vlc-2.1.5-ffmpeg-2.4.patch'
+        'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch')
 md5sums=('3941b561f590cc95ca5e795213cba2f2'
          '6df10774bb7acf20e09d6139e5c7839e'
-         '068a1b792064bb1aff0765a3ffa8a27a')
+         '068a1b792064bb1aff0765a3ffa8a27a'
+         '787a854f3acde37cd6e76a8fa8e6f1d0')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
+  patch -p1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
   patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch"
+  patch -p1 -i "${srcdir}/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch"
   autoreconf -fi
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
diff --git a/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch b/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
new file mode 100644
index 0000000..f15de12
--- /dev/null
+++ b/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
@@ -0,0 +1,26 @@
+From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Wed, 30 Jul 2014 19:05:43 +0300
+Subject: [PATCH] avformat: initialize probe data (fixes #11851)
+
+(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee)
+---
+ modules/demux/avformat/demux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
+index bdd77fd..7349db2 100644
+--- a/modules/demux/avformat/demux.c
++++ b/modules/demux/avformat/demux.c
+@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this )
+ {
+     demux_t       *p_demux = (demux_t*)p_this;
+     demux_sys_t   *p_sys;
+-    AVProbeData   pd;
++    AVProbeData   pd = { };
+     AVInputFormat *fmt = NULL;
+     unsigned int  i;
+     int64_t       i_start_time = -1;
+-- 
+2.1.0
+