[arch-commits] Commit in vlc/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Monday, October 13, 2014 @ 08:35:50
  Author: bpiotrowski
Revision: 224255

upgpkg: vlc 2.1.5-4

apply possible fix for segfaults with ffmpeg 2.4 (FS#42099)

Added:
  vlc/trunk/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
Modified:
  vlc/trunk/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |   11 ++--
 vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch |   26 +++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-13 00:57:15 UTC (rev 224254)
+++ PKGBUILD	2014-10-13 06:35:50 UTC (rev 224255)
@@ -5,7 +5,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/"
@@ -58,16 +58,19 @@
 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

Added: vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
===================================================================
--- vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch	                        (rev 0)
+++ vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch	2014-10-13 06:35:50 UTC (rev 224255)
@@ -0,0 +1,26 @@
+From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at 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
+