[SCM] xbmc/master: Fix random failure in playing video using VDPAU

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 11f50563ca38405e70cdebb087ada5c7b300ec29
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Oct 26 19:49:46 2014 +0100

    Fix random failure in playing video using VDPAU
    
    Closes: #742896

diff --git a/debian/patches/0017-libav-Fix-uninitialized-read.patch b/debian/patches/0017-libav-Fix-uninitialized-read.patch
new file mode 100644
index 0000000..968151e
--- /dev/null
+++ b/debian/patches/0017-libav-Fix-uninitialized-read.patch
@@ -0,0 +1,26 @@
+From 414522d5049a230e71a2c2fef45a6b525d6a9803 Mon Sep 17 00:00:00 2001
+From: Anton Khirnov <anton at khirnov.net>
+Date: Sun, 26 Oct 2014 18:29:48 +0100
+Subject: [PATCH] Fix uninitialized read.
+
+---
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+index 932985a..9d90a9c 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+@@ -1095,9 +1095,6 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
+ 
+   CSingleLock lock(m_DecoderSection);
+ 
+-  if (m_DecoderError && pFrame)
+-    return VC_ERROR;
+-
+   if (!m_vdpauConfigured)
+     return VC_ERROR;
+ 
+-- 
+2.0.0.rc2
+
diff --git a/debian/patches/series b/debian/patches/series
index 3857f59..89523c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@
 0013-mips-Add-configure-option-for-mips-and-mipsel.patch
 0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
 0016-mips-Fix-build-with-using-OpenGL-rendering.patch
+0017-libav-Fix-uninitialized-read.patch
 03-privacy.patch
 04-differentiate-from-vanilla-XBMC.patch
 05-Fix-GLES-with-X11.patch

-- 
xbmc packaging