wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

dxva2-Video_Decoder: Fix compile warning when compiling without libva support.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-12-26 16:37:54 +01:00
parent 8db21bfce6
commit b372d532ca
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
patches/dxva2-Video_Decoder/0012-dxva2-Only-declare-debug-channels-when-they-are-actu.patch Normal file
View File

@ -0,0 +1,47 @@
From 80c897ec6ff9497c0d1f65afc3e78e76f6dacb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 26 Dec 2016 16:29:08 +0100
Subject: dxva2: Only declare debug channels when they are actually used.
---
dlls/dxva2/vaapi-h264.c | 4 ++--
dlls/dxva2/vaapi-mpeg2.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/dxva2/vaapi-h264.c b/dlls/dxva2/vaapi-h264.c
index ea3253c..12610ba 100644
--- a/dlls/dxva2/vaapi-h264.c
+++ b/dlls/dxva2/vaapi-h264.c
@@ -31,10 +31,10 @@
#include "dxva.h"
#include "dxva2_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(dxva2);
-
#ifdef HAVE_VAAPI
+WINE_DEFAULT_DEBUG_CHANNEL(dxva2);
+
#define MAX_SLICES 4096
#define SLICE_TYPE_P 0
diff --git a/dlls/dxva2/vaapi-mpeg2.c b/dlls/dxva2/vaapi-mpeg2.c
index 3b4b859..8b079e5 100644
--- a/dlls/dxva2/vaapi-mpeg2.c
+++ b/dlls/dxva2/vaapi-mpeg2.c
@@ -31,10 +31,10 @@
#include "dxva.h"
#include "dxva2_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(dxva2);
-
#ifdef HAVE_VAAPI
+WINE_DEFAULT_DEBUG_CHANNEL(dxva2);
+
#define MAX_SLICES 1024
static inline UINT estimate_maximum_slice_size( UINT width, UINT height )
--
2.9.0

2
patches/patchinstall.sh
View File

@ -3881,6 +3881,7 @@ if test "$enable_dxva2_Video_Decoder" -eq 1; then
patch_apply dxva2-Video_Decoder/0009-dxva2-Add-DRM-mode-for-vaapi.patch
patch_apply dxva2-Video_Decoder/0010-dxva2-Fill-h264-luma-and-chroma-weights-offsets-with.patch
patch_apply dxva2-Video_Decoder/0011-dxva2-Always-destroy-buffers-when-calling-vaRenderPi.patch
patch_apply dxva2-Video_Decoder/0012-dxva2-Only-declare-debug-channels-when-they-are-actu.patch
(
echo '+ { "Sebastian Lackner", "dxva2: Implement semi-stub for Direct3DDeviceManager9 interface.", 1 },';
echo '+ { "Michael Müller", "dxva2: Implement stubbed interfaces for IDirectXVideo{Acceleration,Decoder,Processor}Service.", 1 },';
@ -3893,6 +3894,7 @@ if test "$enable_dxva2_Video_Decoder" -eq 1; then
echo '+ { "Michael Müller", "dxva2: Add DRM mode for vaapi.", 1 },';
echo '+ { "Michael Müller", "dxva2: Fill h264 luma and chroma weights / offsets with default values in case they are not specified.", 1 },';
echo '+ { "Michael Müller", "dxva2: Always destroy buffers when calling vaRenderPicture.", 1 },';
echo '+ { "Michael Müller", "dxva2: Only declare debug channels when they are actually used.", 1 },';
) >> "$patchlist"
fi