xbmc-pvr: add patches from last merge

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-08-12 17:55:09 +02:00
parent 7c9000da0f
commit 15e4106e38
2 changed files with 58 additions and 0 deletions

View File

@ -0,0 +1,34 @@
From 0c2185d62f858f7b41461b4141e731dc7ec01ca6 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 11 Aug 2011 18:35:18 +0200
Subject: [PATCH] LinuxRendererGL: increase buffers to 3
---
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
index 18c6da4..79a9d90 100644
--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -223,7 +223,7 @@ bool CLinuxRendererGL::ValidateRenderer()
void CLinuxRendererGL::ManageTextures()
{
- m_NumYV12Buffers = 2;
+ m_NumYV12Buffers = 3;
//m_iYV12RenderBuffer = 0;
return;
}
@@ -720,7 +720,7 @@ unsigned int CLinuxRendererGL::PreInit()
m_resolution = RES_PAL_4x3;
m_iYV12RenderBuffer = 0;
- m_NumYV12Buffers = 2;
+ m_NumYV12Buffers = 3;
// setup the background colour
m_clearColour = (float)(g_advancedSettings.m_videoBlackBarColour & 0xff) / 0xff;
--
1.7.5.4

View File

@ -0,0 +1,24 @@
From d25fbc8248be3cc0b208614faca394c56157cf1a Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Fri, 12 Aug 2011 12:39:37 +0200
Subject: [PATCH] vaapi: store reordered_opaque to pic
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
index d9d2bd2..bcc3fe1 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
@@ -205,6 +205,7 @@ int CDecoder::GetBuffer(AVCodecContext *avctx, AVFrame *pic)
pic->linesize[1] = 0;
pic->linesize[2] = 0;
pic->linesize[3] = 0;
+ pic->reordered_opaque= avctx->reordered_opaque;
return 0;
}
--
1.7.5.4