[SCM] vlc/master: Upstream patch to fix hardware decoding with libvdpau-va-gl

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a76b430796310abc9440f82e496d2dd82e254b88
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Mar 13 21:12:43 2016 +0100

    Upstream patch to fix hardware decoding with libvdpau-va-gl
    
    Closes: #813370

diff --git a/debian/patches/avcodec-pass-consistent-dimensions-to-hardware-decod.patch b/debian/patches/avcodec-pass-consistent-dimensions-to-hardware-decod.patch
new file mode 100644
index 0000000..58ced9d
--- /dev/null
+++ b/debian/patches/avcodec-pass-consistent-dimensions-to-hardware-decod.patch
@@ -0,0 +1,35 @@
+From bdd50cc0d7c316d123974ca9ae35c02f550fdc35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remid at nvidia.com>
+Date: Mon, 22 Feb 2016 07:17:23 +0200
+Subject: [PATCH 23/60] avcodec: pass consistent dimensions to hardware decoder
+
+Commit 01c4f44e88bfbb8ecf108c0fe40f3797bddac686 fixed one call site of
+vlc_va_Setup() but left the other one silently broken. This should fix
+decoding with libvdpau-va-gl (untested).
+
+The original regression was introduced by
+commit b71c85b3d88b8d0ad2d4a63bf58ebcd2ad771cbf.
+---
+ modules/codec/avcodec/video.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
+index 0ecd7fe..c115db9 100644
+--- a/modules/codec/avcodec/video.c
++++ b/modules/codec/avcodec/video.c
+@@ -1359,10 +1359,10 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
+ 
+         /* We try to call vlc_va_Setup when possible to detect errors when
+          * possible (later is too late) */
+-        if( p_context->width > 0 && p_context->height > 0
++        if( p_context->coded_width > 0 && p_context->coded_height > 0
+          && vlc_va_Setup( p_va, &p_context->hwaccel_context,
+                           &p_dec->fmt_out.video.i_chroma,
+-                          p_context->width, p_context->height ) )
++                          p_context->coded_width, p_context->coded_height ) )
+         {
+             msg_Err( p_dec, "acceleration setup failure" );
+             break;
+-- 
+2.7.0
+

-- 
VLC media player packaging