jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: update XVBA/VDPAU patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@linux.fritz.box>
This commit is contained in:
Stephan Raue 2012-12-02 00:24:05 +01:00
parent 5e89453ee0
commit 8601794da8
1 changed files with 196 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

342
packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-af4bbe3.patch → packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-77888a2.patch
View File

@ -1,7 +1,57 @@
From 7ed43cab1c4e92eb0b011d50db3325d4402013ab Mon Sep 17 00:00:00 2001
From 5fbfde4edcd9d852f2a2d7de1cb09f388ddd393d Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Sun, 4 Nov 2012 14:05:52 +0100
Subject: [PATCH 01/58] configure: add --enable-pvraddons-with-dependencies
switch for intree building of PVR Addons
---
configure.in | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/configure.in b/configure.in
index beb58c1..82f457a 100644
--- a/configure.in
+++ b/configure.in
@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg],
[use_external_ffmpeg=$use_external_libraries])
### End of external library options
+### PVR addons specific
+AC_ARG_ENABLE([pvraddons-with-dependencies],
+ [AS_HELP_STRING([--enable-pvraddons-with-dependencies],
+ [enable build of pvr addons with dependencies (default is no) 'Linux only'])],
+ [use_pvraddons_with_deps=$enableval],
+ [use_pvraddons_with_deps=no])
+
+### End PVR addons specific
if test "x$host_vendor" != "xapple"; then
DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT"
@@ -2766,12 +2774,16 @@ XB_CONFIG_MODULE([pvr-addons], [
if test "$USE_EXTERNAL_FFMPEG" = 1; then
PVR_EXT_FFMPEG="--enable-external-ffmpeg"
fi
+ if test "$use_pvraddons_with_deps" = "yes"; then
+ ADDONS_WITH_DEPS="--enable-addons-with-dependencies"
+ fi
./configure \
--prefix="${prefix}" \
--host=$host_alias \
--build=$build_alias \
--target=$target_alias \
$PVR_EXT_FFMPEG \
+ $ADDONS_WITH_DEPS \
CC="$CC" \
CXX="$CXX" \
CFLAGS="$CFLAGS" \
--
1.7.10
From 58b1544f23706cd4097442d43fd9f40e17dd1315 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:03:31 +0200
Subject: [PATCH 01/57] VideoRenerers: add buffering
Subject: [PATCH 02/58] VideoRenerers: add buffering
---
xbmc/Application.cpp | 3 +
@ -21,7 +71,7 @@ Subject: [PATCH 01/57] VideoRenerers: add buffering
14 files changed, 380 insertions(+), 93 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index d6bfb64..6d5c280 100644
index ef18568..f85aaac 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2345,7 +2345,10 @@ void CApplication::Render()
@ -897,7 +947,7 @@ index 2ab5684..f493ba7 100644
virtual unsigned int PreInit();
virtual void UnInit();
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 30d3522..914f761 100644
index 1a4c23c..bf47cd1 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -462,7 +462,7 @@ bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
@ -984,10 +1034,10 @@ index 3008c25..a4bb1ba 100644
1.7.10
From dd90b0bd4ae5479ff925aa6b99e1fbccdaef396d Mon Sep 17 00:00:00 2001
From 2c7b662016485902950503f2a02542522dc744c9 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 2 Oct 2012 10:49:09 +0200
Subject: [PATCH 02/57] linuxrenderer: delete all textures on reconfigure
Subject: [PATCH 03/58] linuxrenderer: delete all textures on reconfigure
---
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 2 +-
@ -1010,10 +1060,10 @@ index a740954..15e5757 100644
1.7.10
From c703202f29d188e80dc496b76582f1b5f7549d1d Mon Sep 17 00:00:00 2001
From cc49be517f99d87e680418403d789fdca4bfdaeb Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:17:33 +0200
Subject: [PATCH 03/57] drop frame counter in application, ask render manager
Subject: [PATCH 04/58] drop frame counter in application, ask render manager
instead
---
@ -1024,7 +1074,7 @@ Subject: [PATCH 03/57] drop frame counter in application, ask render manager
4 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 6d5c280..783c247 100644
index f85aaac..e9b9ba0 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -414,8 +414,6 @@
@ -1119,7 +1169,7 @@ index 6d5c280..783c247 100644
}
void CApplication::SetStandAlone(bool value)
@@ -5591,12 +5566,6 @@ bool CApplication::SwitchToFullScreen()
@@ -5580,12 +5555,6 @@ bool CApplication::SwitchToFullScreen()
// See if we're playing a video, and are in GUI mode
if ( IsPlayingVideo() && g_windowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO)
{
@ -1132,7 +1182,7 @@ index 6d5c280..783c247 100644
// then switch to fullscreen mode
g_windowManager.ActivateWindow(WINDOW_FULLSCREEN_VIDEO);
return true;
@@ -5829,7 +5798,6 @@ bool CApplication::IsCurrentThread() const
@@ -5818,7 +5787,6 @@ bool CApplication::IsCurrentThread() const
bool CApplication::IsPresentFrame()
{
@ -1141,7 +1191,7 @@ index 6d5c280..783c247 100644
return ret;
diff --git a/xbmc/Application.h b/xbmc/Application.h
index 650fc87..19239c4 100644
index 33d500d..f0456be 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -424,10 +424,8 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
@ -1192,10 +1242,10 @@ index 34ff8d0..288175e 100644
1.7.10
From e9ccc3d6ae428bf55c07d37a392f0e99248e0d15 Mon Sep 17 00:00:00 2001
From 03fde5238101a7b0190b516fc6cb79c95966808f Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:34:39 +0200
Subject: [PATCH 04/57] videoplayer: adopt lateness detection and dropping to
Subject: [PATCH 05/58] videoplayer: adopt lateness detection and dropping to
buffering
---
@ -1734,10 +1784,10 @@ index fe7e12c..4913712 100644
1.7.10
From e20313553b757663681bf1abee2a8df48f27fdfc Mon Sep 17 00:00:00 2001
From 532dbba16199d9f40b427b23f4922582883746eb Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:41:31 +0200
Subject: [PATCH 05/57] videoplayer: update frametime, it might change due to
Subject: [PATCH 06/58] videoplayer: update frametime, it might change due to
fps detection
---
@ -1761,10 +1811,10 @@ index 93908a7..4675556 100644
1.7.10
From 404ff4e7e9a798798cf06f9574de60749b976a48 Mon Sep 17 00:00:00 2001
From bba5b177fdc05dd35aa515757106c0b7f45501e5 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:43:06 +0200
Subject: [PATCH 06/57] videoplayer: give streams with invalid fps a chance
Subject: [PATCH 07/58] videoplayer: give streams with invalid fps a chance
for fps detection
---
@ -1788,10 +1838,10 @@ index 4675556..2ef6358 100644
1.7.10
From 43ad7c0e498f6cd516288c96706f681fe982404f Mon Sep 17 00:00:00 2001
From 066a5bfdea464e3c2b1d42b7d95b94a0985340f0 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:49:05 +0200
Subject: [PATCH 07/57] dvdplayer: allow rewinding at end of stream, do a seek
Subject: [PATCH 08/58] dvdplayer: allow rewinding at end of stream, do a seek
after rewind
---
@ -1799,7 +1849,7 @@ Subject: [PATCH 07/57] dvdplayer: allow rewinding at end of stream, do a seek
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 914f761..bcc55a1 100644
index bf47cd1..bd84086 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1554,7 +1554,7 @@ void CDVDPlayer::HandlePlaySpeed()
@ -1828,10 +1878,10 @@ index 914f761..bcc55a1 100644
1.7.10
From f573d3b2817246a767c6ad0c3b75aad5622212c9 Mon Sep 17 00:00:00 2001
From 2ab8e42700f00f0abb0b87547bb7e310e5db5700 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 2 Sep 2012 16:05:21 +0200
Subject: [PATCH 08/57] video player: present correct pts to user for a/v sync
Subject: [PATCH 09/58] video player: present correct pts to user for a/v sync
(after buffering in renderer)
---
@ -1922,10 +1972,10 @@ index 4913712..509d5f7 100644
1.7.10
From 9061773a4fca46d5ea8937d6932cab883d2ae4bf Mon Sep 17 00:00:00 2001
From 1692470e838c868b5e11c30a66faf493ae141321 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 11:02:29 +0200
Subject: [PATCH 09/57] vaapi: adopt to buffering in renderer
Subject: [PATCH 10/58] vaapi: adopt to buffering in renderer
---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +-
@ -1983,10 +2033,10 @@ index 863edc4..417cbc0 100644
1.7.10
From 9bb606f34821d3263a2fcb7a5ad664aa0e9bc203 Mon Sep 17 00:00:00 2001
From 2d199663b2c266c77af4bf9217f2974ca7caabb8 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 7 Apr 2012 09:19:00 +0200
Subject: [PATCH 10/57] vdpau: redesign
Subject: [PATCH 11/58] vdpau: redesign
---
language/English/strings.po | 12 +-
@ -2017,7 +2067,7 @@ Subject: [PATCH 10/57] vdpau: redesign
create mode 100644 xbmc/utils/ActorProtocol.h
diff --git a/language/English/strings.po b/language/English/strings.po
index ead5a13..c926f08 100644
index 7d35a93..d046110 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -5114,7 +5114,15 @@ msgctxt "#13434"
@ -7634,7 +7684,7 @@ index 10e2225..15a39fa 100644
formatstr = "DXVA";
break;
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 61ef7c7..249ff04 100644
index f79fcc1..e988e1b 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -98,7 +98,7 @@ void CAdvancedSettings::Initialize()
@ -7655,7 +7705,7 @@ index 61ef7c7..249ff04 100644
m_DXVACheckCompatibility = false;
m_DXVACheckCompatibilityPresent = false;
m_DXVAForceProcessorRenderer = true;
@@ -489,7 +491,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
@@ -490,7 +492,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetString(pElement,"cleandatetime", m_videoCleanDateTimeRegExp);
XMLUtils::GetString(pElement,"ppffmpegdeinterlacing",m_videoPPFFmpegDeint);
XMLUtils::GetString(pElement,"ppffmpegpostprocessing",m_videoPPFFmpegPostProc);
@ -7664,7 +7714,7 @@ index 61ef7c7..249ff04 100644
XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f);
XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers);
XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f);
@@ -497,6 +499,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
@@ -498,6 +500,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI);
XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace);
XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1);
@ -7674,7 +7724,7 @@ index 61ef7c7..249ff04 100644
TiXmlElement* pAdjustRefreshrate = pElement->FirstChildElement("adjustrefreshrate");
if (pAdjustRefreshrate)
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 886fb0a..bf015c7 100644
index c262e4e..c0370e6 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -133,6 +133,8 @@ class CAdvancedSettings
@ -7696,7 +7746,7 @@ index 886fb0a..bf015c7 100644
bool m_videoEnableHighQualityHwScalers;
float m_videoAutoScaleMaxFps;
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
index a8631d6..87fa29d 100644
index 4464abb..e9bc6f5 100644
--- a/xbmc/settings/GUISettings.cpp
+++ b/xbmc/settings/GUISettings.cpp
@@ -685,6 +685,8 @@ void CGUISettings::Initialize()
@ -7709,7 +7759,7 @@ index a8631d6..87fa29d 100644
#ifdef HAVE_LIBVA
AddBool(vp, "videoplayer.usevaapi", 13426, true);
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
index 1f83cc9..3f4244f 100644
index 8b29c4f..785f24d 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -596,6 +596,40 @@ void CGUIWindowSettingsCategory::UpdateSettings()
@ -8146,10 +8196,10 @@ index e7af3cb..2dd8a9f 100644
1.7.10
From 9ab07782d8a10388ad8ac0ead3e439418fe7d00b Mon Sep 17 00:00:00 2001
From 40ce0dfbdd114dc86b1473392b76a8477b715d5b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 25 Sep 2012 12:14:15 +0200
Subject: [PATCH 11/57] linuxrenderer: drop method RenderMultiPass
Subject: [PATCH 12/58] linuxrenderer: drop method RenderMultiPass
---
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++-------
@ -8199,10 +8249,10 @@ index 3218cd5..afc78c2 100644
1.7.10
From befe5e9277214dce5c06011defa7a89228e54faf Mon Sep 17 00:00:00 2001
From 7474394537c4eea68e088cde78577978d46c8455 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 25 Sep 2012 13:20:47 +0200
Subject: [PATCH 12/57] linuxrenderer: implement progressive weave for vdpau
Subject: [PATCH 13/58] linuxrenderer: implement progressive weave for vdpau
---
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 ++++++++++++++++++-------
@ -8330,10 +8380,10 @@ index afc78c2..2fc34ae 100644
1.7.10
From 9d04e4fadfcf974f8ed6e759aa7f3003b485fd96 Mon Sep 17 00:00:00 2001
From e6f1e4673fcbdb4fad66cd78d6a96a2134b376bd Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:22:05 +0200
Subject: [PATCH 13/57] X11: ditch SDL for video and window events
Subject: [PATCH 14/58] X11: ditch SDL for video and window events
---
xbmc/Application.cpp | 2 +-
@ -8349,7 +8399,7 @@ Subject: [PATCH 13/57] X11: ditch SDL for video and window events
create mode 100644 xbmc/windowing/WinEventsX11.h
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 783c247..4e2ea04 100644
index e9b9ba0..d2a0352 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -780,7 +780,7 @@ bool CApplication::CreateGUI()
@ -9817,10 +9867,10 @@ index 2dd8a9f..9616d17 100644
1.7.10
From 4b1644c370145ce9a97909c697ce4648f55d0b81 Mon Sep 17 00:00:00 2001
From 69c6e04937b94309459d93fc9e72be60400b2764 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:24:22 +0200
Subject: [PATCH 14/57] X11: Add xbmc icon
Subject: [PATCH 15/58] X11: Add xbmc icon
---
xbmc/windowing/X11/WinSystemX11.cpp | 126 ++++++++++++++++++++++++++++++++++-
@ -10009,10 +10059,10 @@ index 9616d17..debf714 100644
1.7.10
From 0845e04afb4bd0004c2d336a1c94a4b78425be83 Mon Sep 17 00:00:00 2001
From 377a09cf01961fff54a6e7b995a7b84cb26ea9e6 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 20 May 2012 14:11:26 +0200
Subject: [PATCH 15/57] X11: add SDL joystick until we have a better solution
Subject: [PATCH 16/58] X11: add SDL joystick until we have a better solution
---
xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++
@ -10066,10 +10116,10 @@ index 24477ae..2ec86a8 100644
1.7.10
From 9e8aa22817bed82f3f0f6ed0b252c235a4a3bfe7 Mon Sep 17 00:00:00 2001
From f6f9d3688c745890331c040d231f34752ad4bd2d Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 12:35:55 +0200
Subject: [PATCH 16/57] X11: factor out code handling device reset
Subject: [PATCH 17/58] X11: factor out code handling device reset
notification
---
@ -10133,10 +10183,10 @@ index debf714..8c28e3f 100644
1.7.10
From 9a5269d8b709e086a6983e8512274cc86b6419b3 Mon Sep 17 00:00:00 2001
From 4ec04fa1d25596745b4499ae37503647bd212bd4 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:02:00 +0200
Subject: [PATCH 17/57] X11: move xrandr events to WinEventsX11
Subject: [PATCH 18/58] X11: move xrandr events to WinEventsX11
---
xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++
@ -10280,10 +10330,10 @@ index 70557d0..1cce843 100644
1.7.10
From 2e9285bfd926d7bc6dc1e5b572a8e55a69ef9e12 Mon Sep 17 00:00:00 2001
From 1661885a13a500db73af817de5629538ee8bf65f Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 12 Apr 2012 15:43:56 +0200
Subject: [PATCH 18/57] xrandr: remove method RestoreState
Subject: [PATCH 19/58] xrandr: remove method RestoreState
---
xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++--
@ -10362,10 +10412,10 @@ index 2a269d0..5b64633 100644
1.7.10
From adf0d2a49ceffea790fd288cf4511224f084c5dc Mon Sep 17 00:00:00 2001
From 01182003c79da8445e0d8cdf951cb7c6d3579c70 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 20 May 2012 13:17:10 +0200
Subject: [PATCH 19/57] xrandr: observe orientation
Subject: [PATCH 20/58] xrandr: observe orientation
---
xbmc/windowing/X11/WinSystemX11.cpp | 61 +++++++++++++++++++++++++++++++++--
@ -10534,10 +10584,10 @@ index 5b64633..618bd68 100644
1.7.10
From b3e3e45e62e0364d1865b063968e35b9b608c559 Mon Sep 17 00:00:00 2001
From 2249ddc7458204c171fcf8ed29c39b66373a2de6 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:54:15 +0200
Subject: [PATCH 20/57] xrandr: allow getting info for multiple screen's
Subject: [PATCH 21/58] xrandr: allow getting info for multiple screen's
Refactored by: Joakim Plate <elupus@xbmc.org>
---
@ -10712,10 +10762,10 @@ index 618bd68..0824af5 100644
1.7.10
From 364fe5456d689f1bb5da7886b5d770ac3cb93f41 Mon Sep 17 00:00:00 2001
From bd5aaf4fca228cb80d361262b9e28c7f2443fa0b Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:44:00 +0200
Subject: [PATCH 21/57] X11: fix multi-head setups
Subject: [PATCH 22/58] X11: fix multi-head setups
---
language/English/strings.po | 4 +-
@ -10729,7 +10779,7 @@ Subject: [PATCH 21/57] X11: fix multi-head setups
8 files changed, 235 insertions(+), 115 deletions(-)
diff --git a/language/English/strings.po b/language/English/strings.po
index c926f08..f9dc9d3 100644
index d046110..9887f19 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -895,7 +895,9 @@ msgctxt "#245"
@ -10756,7 +10806,7 @@ index efe5493..85d780d 100644
virtual void SetViewPort(CRect& viewPort);
virtual void GetViewPort(CRect& viewPort);
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
index 87fa29d..63d497b 100644
index e9bc6f5..abf5c01 100644
--- a/xbmc/settings/GUISettings.cpp
+++ b/xbmc/settings/GUISettings.cpp
@@ -392,11 +392,16 @@ void CGUISettings::Initialize()
@ -10777,7 +10827,7 @@ index 87fa29d..63d497b 100644
// contains an index to the g_settings.m_ResInfo array. the only meaningful fields are iScreen, iWidth, iHeight.
#if defined(TARGET_DARWIN)
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
index 3f4244f..e5513d0 100644
index 785f24d..89addf7 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -528,6 +528,12 @@ void CGUIWindowSettingsCategory::CreateSettings()
@ -10793,7 +10843,7 @@ index 3f4244f..e5513d0 100644
else if (strSetting.Equals("lookandfeel.skintheme"))
{
AddSetting(pSetting, group->GetWidth(), iControlID);
@@ -1488,6 +1494,20 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC
@@ -1489,6 +1495,20 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC
// Cascade
FillInResolutions("videoscreen.resolution", mode, RES_DESKTOP, true);
}
@ -10814,7 +10864,7 @@ index 3f4244f..e5513d0 100644
else if (strSetting.Equals("videoscreen.resolution"))
{
RESOLUTION nextRes = (RESOLUTION) g_guiSettings.GetInt("videoscreen.resolution");
@@ -2412,11 +2432,15 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
@@ -2418,11 +2438,15 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
if (g_advancedSettings.m_canWindowed)
pControl->AddLabel(g_localizeStrings.Get(242), -1);
@ -10830,7 +10880,7 @@ index 3f4244f..e5513d0 100644
pControl->SetValue(mode);
g_guiSettings.SetInt("videoscreen.screen", mode);
}
@@ -2424,6 +2448,36 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
@@ -2430,6 +2454,36 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
return mode;
}
@ -10867,7 +10917,7 @@ index 3f4244f..e5513d0 100644
void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, DisplayMode mode, RESOLUTION res, bool UserChange)
{
CBaseSettingControl *control = GetSetting(strSetting);
@@ -2552,13 +2606,15 @@ void CGUIWindowSettingsCategory::OnRefreshRateChanged(RESOLUTION nextRes)
@@ -2558,13 +2612,15 @@ void CGUIWindowSettingsCategory::OnRefreshRateChanged(RESOLUTION nextRes)
RESOLUTION lastRes = g_graphicsContext.GetVideoResolution();
bool cancelled = false;
@ -11447,10 +11497,10 @@ index 93cf5db..71034fc 100644
1.7.10
From ff92b167d0b780bc6b3a8b84221e93e558cb2a55 Mon Sep 17 00:00:00 2001
From a172c0820920629f6bbfc5c93b855d1495e09ec8 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:36:32 +0200
Subject: [PATCH 22/57] X11: remove all DefaultScreen and RootWindow macros
Subject: [PATCH 23/58] X11: remove all DefaultScreen and RootWindow macros
---
xbmc/windowing/X11/WinSystemX11.cpp | 6 +++---
@ -11518,10 +11568,10 @@ index f858f88..d192697 100644
1.7.10
From f085396cb2cd8653f86029fff42b1d0cd28b9237 Mon Sep 17 00:00:00 2001
From 6b513d66eeea6d266e3d447012445b8598e39c72 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:45:22 +0200
Subject: [PATCH 23/57] X11: remove all DefaultScreen and RootWindow macros
Subject: [PATCH 24/58] X11: remove all DefaultScreen and RootWindow macros
(VideoRefClock)
Note this is on a separate display connection.
@ -11593,10 +11643,10 @@ index 9785fe7..0004e07 100644
1.7.10
From 41f8f32f193e67066c5aedffb7eb141008008099 Mon Sep 17 00:00:00 2001
From 85e142c39ee955350da2dd1d690677ad84c810ec Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 20 Jun 2012 17:37:11 +0200
Subject: [PATCH 24/57] X11: recreate gl context after output has changed
Subject: [PATCH 25/58] X11: recreate gl context after output has changed
---
xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++----------
@ -11747,10 +11797,10 @@ index d192697..0f2d1d2 100644
1.7.10
From c6dd5ebe1bfeb080a0b1a7573774a63783c9a58d Mon Sep 17 00:00:00 2001
From e93c757a4f7a982af81f5e647e6e246d330fd5ec Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:06:25 +0200
Subject: [PATCH 25/57] X11: hook video reference clock in windowing
Subject: [PATCH 26/58] X11: hook video reference clock in windowing
---
xbmc/video/VideoReferenceClock.cpp | 71 ++++++++++++++++++++++++++----------
@ -11955,10 +12005,10 @@ index dcc4f09..7eb6317 100644
1.7.10
From 4843434cb64fa6d7bbb6e276c6f119f597d5450b Mon Sep 17 00:00:00 2001
From 514b28d959f14ca495e76f1e8b2f0f5cd55082ce Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 21 Jun 2012 17:26:51 +0200
Subject: [PATCH 26/57] X11: fix video calibrations
Subject: [PATCH 27/58] X11: fix video calibrations
---
xbmc/settings/Settings.cpp | 1 +
@ -12063,10 +12113,10 @@ index cc28f56..c046c86 100644
1.7.10
From 82d9dc4dc490f65331dc190eab555a422e0d505d Mon Sep 17 00:00:00 2001
From a9c1e53503d51463f731763cb4eaa58a4dc7d83d Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:00:26 +0200
Subject: [PATCH 27/57] X11: deactivate screen saver on startup
Subject: [PATCH 28/58] X11: deactivate screen saver on startup
---
xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++
@ -12136,10 +12186,10 @@ index c046c86..e953d2d 100644
1.7.10
From 7f6ad101a65425425f23910887ca9cf0d8067b14 Mon Sep 17 00:00:00 2001
From a2f6f8c51f7a0bf58c9f42536b14880a5592a016 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:10:09 +0200
Subject: [PATCH 28/57] X11: change method of going full-screen
Subject: [PATCH 29/58] X11: change method of going full-screen
---
xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++-
@ -12183,10 +12233,10 @@ index b3e7ab5..91f92c1 100644
1.7.10
From 9c6af0be06f7bbd6f44ed6b83edc613c1e28451a Mon Sep 17 00:00:00 2001
From 32561409b440dec1ad2aa0542b32b3c687512045 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Jun 2012 19:12:39 +0200
Subject: [PATCH 29/57] X11: reset key repeat and key modifier on focus lost
Subject: [PATCH 30/58] X11: reset key repeat and key modifier on focus lost
and gain
---
@ -12218,10 +12268,10 @@ index 6c22358..d86205d 100644
1.7.10
From c5c126d4d797907a4f601a4149aab6f48a7e7012 Mon Sep 17 00:00:00 2001
From c89ca3e1e69fce896d866d1c92bc5626baae8406 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 14:18:46 +0200
Subject: [PATCH 30/57] X11: replace custom utf8 to unicode with charset
Subject: [PATCH 31/58] X11: replace custom utf8 to unicode with charset
convertor (squash to x11 events)
---
@ -12438,10 +12488,10 @@ index 6100933..72955ad 100644
1.7.10
From ad85c65f39d94863beb57eefc635ddebf6a508ec Mon Sep 17 00:00:00 2001
From f14ba6206ff8cdb5acd928528b78bfd0f3bcf9cd Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 14:23:54 +0200
Subject: [PATCH 31/57] X11: fixed invalid usage of sizeof() (squash into x11
Subject: [PATCH 32/58] X11: fixed invalid usage of sizeof() (squash into x11
changes)
---
@ -12505,10 +12555,10 @@ index 72955ad..102a076 100644
1.7.10
From 1bd72e96f0b671cbaf127223cc62f0eda47614e3 Mon Sep 17 00:00:00 2001
From 70b39d59155703ea8f3f80b33e11298b5bbb8316 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 9 Jun 2012 18:23:53 +0200
Subject: [PATCH 32/57] add missing keys to xbmc keytable
Subject: [PATCH 33/58] add missing keys to xbmc keytable
---
xbmc/input/XBMC_keytable.cpp | 2 ++
@ -12531,10 +12581,10 @@ index dbc28a7..0ab6e78 100644
1.7.10
From 9e98c2b5917767e684aaac2b84e0f7ebfdeb3284 Mon Sep 17 00:00:00 2001
From 2cac8b3da3061ea9847e475aa50030a882f09e63 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 16 Mar 2012 15:57:51 +0100
Subject: [PATCH 33/57] videorefclock: temp deactivate of nv settings
Subject: [PATCH 34/58] videorefclock: temp deactivate of nv settings
---
xbmc/video/VideoReferenceClock.cpp | 2 +-
@ -12557,10 +12607,10 @@ index fa8e35a..85e36c7 100644
1.7.10
From ddaf0cad9ff92269214b67804df34e19b1ca11e0 Mon Sep 17 00:00:00 2001
From 2541e950b628baf5cbee4e73a022c8d2d9b66481 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 09:09:09 +0200
Subject: [PATCH 34/57] videorefclock: ask graphics context for refresh rate
Subject: [PATCH 35/58] videorefclock: ask graphics context for refresh rate
---
xbmc/video/VideoReferenceClock.cpp | 3 ++-
@ -12591,10 +12641,10 @@ index 85e36c7..8209163 100644
1.7.10
From 4b9402e117fdf466ac988d107aa0e0f0587d469b Mon Sep 17 00:00:00 2001
From d41b611cce7bbbdbe4e267ea773e0293b7339607 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 9 Jul 2012 14:00:18 +0200
Subject: [PATCH 35/57] X11: fix icon texture after
Subject: [PATCH 36/58] X11: fix icon texture after
cc5ed3c2474084ebc0373a3046410e6f766e03f4
---
@ -12702,10 +12752,10 @@ index 91f92c1..174ccef 100644
1.7.10
From 1dd90c50897b73c28dd6d51ba6ee050cadedeab0 Mon Sep 17 00:00:00 2001
From 9923666f9cf1f0fdabb4b2e0b104e30f0a9fab28 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 10 Jul 2012 11:14:12 +0200
Subject: [PATCH 36/57] X11: check for window manager
Subject: [PATCH 37/58] X11: check for window manager
---
xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++-
@ -12826,10 +12876,10 @@ index e953d2d..0b7c10a 100644
1.7.10
From 43f635f4a1aa15dabb0a3b224ef6029e5c351b98 Mon Sep 17 00:00:00 2001
From 10cf8477872ce1e7f986c66dd2d187745653a9d1 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 12 Jul 2012 11:11:47 +0200
Subject: [PATCH 37/57] X11: dont set window on xrandr if no mode available
Subject: [PATCH 38/58] X11: dont set window on xrandr if no mode available
---
xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++-----
@ -12866,10 +12916,10 @@ index 4f1ae26..c11ea89 100644
1.7.10
From 37845b1d4f5b611fc96d421100edd1865e6ca515 Mon Sep 17 00:00:00 2001
From 8eb784a2b8e9e949742645d94fabeff3194ac359 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 26 Jul 2012 09:34:28 +0200
Subject: [PATCH 38/57] X11: fix crash after a resolution change on startup
Subject: [PATCH 39/58] X11: fix crash after a resolution change on startup
---
xbmc/windowing/X11/WinSystemX11.cpp | 3 ++-
@ -12893,10 +12943,10 @@ index c11ea89..0bd72d4 100644
1.7.10
From fac31c6f55f5c34f051c3a48583791b404c6034c Mon Sep 17 00:00:00 2001
From b727c8d69417726979856e6f1250fa04f1a57589 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 15 Sep 2012 18:27:29 +0200
Subject: [PATCH 39/57] X11: lock graphics context in NotifyXRREvent
Subject: [PATCH 40/58] X11: lock graphics context in NotifyXRREvent
---
xbmc/windowing/X11/WinSystemX11.cpp | 2 ++
@ -12919,10 +12969,10 @@ index 0bd72d4..ef83133 100644
1.7.10
From fce572e48a0b832c50cac54ceb896ac74603de49 Mon Sep 17 00:00:00 2001
From 7ed7ca37f86fb84ad867cf29e78e481bd8425c19 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 8 Oct 2011 16:45:13 +0200
Subject: [PATCH 40/57] ffmpeg: add xvba hwaccel
Subject: [PATCH 41/58] ffmpeg: add xvba hwaccel
---
lib/ffmpeg/configure | 8 ++
@ -13789,10 +13839,10 @@ index f0d9c01..0f8cf7b 100644
1.7.10
From 43fa448d5f65898da9ca6bf01aec4150733141c5 Mon Sep 17 00:00:00 2001
From ba3ff34f25538a4214d3734b12b938b032396a1f Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 12 Apr 2012 12:09:31 +0200
Subject: [PATCH 41/57] xvba: add decoder
Subject: [PATCH 42/58] xvba: add decoder
---
configure.in | 48 +
@ -13815,7 +13865,7 @@ Subject: [PATCH 41/57] xvba: add decoder
create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h
diff --git a/configure.in b/configure.in
index baed203..52d85fa 100644
index 82f457a..c328f0f 100644
--- a/configure.in
+++ b/configure.in
@@ -124,6 +124,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. =="
@ -13892,7 +13942,7 @@ index baed203..52d85fa 100644
if test "x$use_vdadecoder" != "xno"; then
final_message="$final_message\n VDADecoder:\tYes"
else
@@ -2445,6 +2491,7 @@ AC_SUBST(USE_OPENGLES)
@@ -2444,6 +2490,7 @@ AC_SUBST(USE_OPENGLES)
AC_SUBST(USE_VDPAU)
AC_SUBST(USE_VAAPI)
AC_SUBST(USE_CRYSTALHD)
@ -13900,7 +13950,7 @@ index baed203..52d85fa 100644
AC_SUBST(USE_LIBSMBCLIENT)
AC_SUBST(USE_LIBNFS)
AC_SUBST(USE_LIBAFPCLIENT)
@@ -2628,6 +2675,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
@@ -2627,6 +2674,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
`if test "x$use_vdpau" != "xno"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
`if test "x$use_vaapi" != "xno"; then echo --enable-vaapi; else echo --disable-vaapi; fi` \
`if test "$use_optimizations" != "no"; then echo --enable-optimizations; else echo --disable-optimizations; fi` \
@ -13909,7 +13959,7 @@ index baed203..52d85fa 100644
--enable-pthreads \
--enable-runtime-cpudetect \
diff --git a/language/English/strings.po b/language/English/strings.po
index f9dc9d3..c7315f9 100644
index 9887f19..c616348 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -5124,7 +5124,11 @@ msgctxt "#13436"
@ -17197,7 +17247,7 @@ index 15a39fa..e5e71f3 100644
if(m_bAllowFullscreen)
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
index 63d497b..76dafeb 100644
index abf5c01..ee0c789 100644
--- a/xbmc/settings/GUISettings.cpp
+++ b/xbmc/settings/GUISettings.cpp
@@ -696,6 +696,9 @@ void CGUISettings::Initialize()
@ -17239,10 +17289,10 @@ index f25d10d..f6b1ea4 100644
1.7.10
From 3676aa35200c0117368dbcf93fbce8c1531279bb Mon Sep 17 00:00:00 2001
From f14ba2a7b0bb2dc3b3335572e3578c39c44d68ce Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 23 Aug 2012 19:39:49 +0200
Subject: [PATCH 42/57] ffmpeg: add av_find_default_stream_index to interface
Subject: [PATCH 43/58] ffmpeg: add av_find_default_stream_index to interface
---
lib/DllAvFormat.h | 4 ++++
@ -17288,10 +17338,10 @@ index 9bda3f3..bf31fcb 100644
1.7.10
From 7da2bd557c2ec4e4dd3eeb3d8ff5b0005ac22563 Mon Sep 17 00:00:00 2001
From 04c4aec1667a07fc2270a1f5ca5ae4d06833db23 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 16:06:39 +0200
Subject: [PATCH 43/57] dvdplayer: observe pts counter overflow
Subject: [PATCH 44/58] dvdplayer: observe pts counter overflow
---
.../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 +++++++++++++++++++-
@ -17577,10 +17627,10 @@ index 2b5f2e8..e0acf29 100644
1.7.10
From 26225b27f97c236b5b5fe747de5565c8beaf488f Mon Sep 17 00:00:00 2001
From 8154babe8b8862701468ccb33d22798e3fab8c4d Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 2 Oct 2012 13:02:10 +0200
Subject: [PATCH 44/57] dvdplayer: avoid short screen flicker caused by
Subject: [PATCH 45/58] dvdplayer: avoid short screen flicker caused by
unnecessary reconfigure of renderer
---
@ -17613,10 +17663,10 @@ index e5e71f3..8b02d81 100644
1.7.10
From 81deca18232bd24862879346bb6e5bfc0675311a Mon Sep 17 00:00:00 2001
From 5151698a925c539654a90a19d1d3df11d38e7938 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 16 Jun 2012 12:46:30 +0200
Subject: [PATCH 45/57] xvba: do not use vaapi if xvba is present
Subject: [PATCH 46/58] xvba: do not use vaapi if xvba is present
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++
@ -17646,10 +17696,10 @@ index a2b9195..43a05b3 100644
1.7.10
From ef5b3db88462adfdbcc7923ca48b3e933af2400d Mon Sep 17 00:00:00 2001
From 4501236a67eefb4b6def816b57be86f71b19297f Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 12:05:50 +0200
Subject: [PATCH 46/57] vdpau: advanced settings for auto deinterlacing
Subject: [PATCH 47/58] vdpau: advanced settings for auto deinterlacing
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++----
@ -17677,7 +17727,7 @@ index 235f565..d95797b 100644
if (deint != -1)
{
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 249ff04..cc142ab 100644
index e988e1b..710e85e 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -106,6 +106,8 @@ void CAdvancedSettings::Initialize()
@ -17689,7 +17739,7 @@ index 249ff04..cc142ab 100644
m_videoVDPAUtelecine = false;
m_videoVDPAUdeintSkipChromaHD = false;
m_DXVACheckCompatibility = false;
@@ -499,6 +501,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
@@ -500,6 +502,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI);
XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace);
XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1);
@ -17699,7 +17749,7 @@ index 249ff04..cc142ab 100644
XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD);
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index bf015c7..082a1c1 100644
index c0370e6..737fda6 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -133,6 +133,8 @@ class CAdvancedSettings
@ -17715,17 +17765,17 @@ index bf015c7..082a1c1 100644
1.7.10
From 6a71e5165c225a18afdb0c40312f457aec26aad2 Mon Sep 17 00:00:00 2001
From 09c3552c12928c65853920f85c91b02933666c4b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 13:01:08 +0200
Subject: [PATCH 47/57] dvdplayer: correct determination if video is playing
Subject: [PATCH 48/58] dvdplayer: correct determination if video is playing
---
xbmc/cores/dvdplayer/DVDPlayer.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index bcc55a1..fbfb6b4 100644
index bd84086..b09ed01 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -2389,9 +2389,16 @@ bool CDVDPlayer::IsPaused() const
@ -17751,10 +17801,10 @@ index bcc55a1..fbfb6b4 100644
1.7.10
From 75d0a2197e402beee03487d2e53c6d3314ed6ecf Mon Sep 17 00:00:00 2001
From 388d82b9394c452affb1379fe74b10066ae01839 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 14 Oct 2012 13:46:54 +0200
Subject: [PATCH 48/57] rendermanager: fix stuttering in non full-screen mode,
Subject: [PATCH 49/58] rendermanager: fix stuttering in non full-screen mode,
squash to add buffering
---
@ -17780,10 +17830,10 @@ index 0506823..b141c80 100644
1.7.10
From a646e329c45edac2ce37de2bfdcee1d845a46e2a Mon Sep 17 00:00:00 2001
From d025c444708f859b397a3cb110be55c73057c92c Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 14 Oct 2012 17:54:02 +0200
Subject: [PATCH 49/57] rendermanager: forgot to set flip event if buffering
Subject: [PATCH 50/58] rendermanager: forgot to set flip event if buffering
is not used
---
@ -17826,10 +17876,10 @@ index b141c80..9290f80 100644
1.7.10
From 3f89c19c387659eebc10b3da1a1aaa4d5183dc77 Mon Sep 17 00:00:00 2001
From 4f19b85dd90f9eea8bf29e6f208e4fdb1da4d160 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 26 Oct 2012 15:30:22 +0200
Subject: [PATCH 50/57] vdpau: fix small mem leak
Subject: [PATCH 51/58] vdpau: fix small mem leak
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 2 ++
@ -17852,10 +17902,10 @@ index d95797b..fec4b88 100644
1.7.10
From b799ea39bcdf1b49d8a7f8f6016e24a050c3f5b6 Mon Sep 17 00:00:00 2001
From 2fdfb80c70f030a51391f93aa57234cc73191e51 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 29 Oct 2012 18:25:56 +0100
Subject: [PATCH 51/57] xvba: do not render if there is no valid texture
Subject: [PATCH 52/58] xvba: do not render if there is no valid texture
---
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 8 +++-----
@ -17889,10 +17939,10 @@ index 723ab34..4a6ab25 100644
1.7.10
From 415b7179ef53725651ca3c2684219cfc5c5c3cb8 Mon Sep 17 00:00:00 2001
From 6cc9cd9c48f4ee86e0f35544284ba65ec6c1b99f Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 2 Nov 2012 13:20:03 +0100
Subject: [PATCH 52/57] player: fix rewind
Subject: [PATCH 53/58] player: fix rewind
---
xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++-
@ -17940,7 +17990,7 @@ index 30b2f5c..b9831d4 100644
class CDVDMsgPlayerSeekChapter : public CDVDMsg
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index fbfb6b4..8d1b012 100644
index b09ed01..da9058d 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1555,11 +1555,13 @@ void CDVDPlayer::HandlePlaySpeed()
@ -18137,10 +18187,10 @@ index 509d5f7..7cddda7 100644
1.7.10
From 4a7225fae776993363904343d36455f0928cd422 Mon Sep 17 00:00:00 2001
From 3ca0b89c8009e1e61da27d7bc616b8cb03435bd5 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Fri, 2 Nov 2012 17:56:12 +0100
Subject: [PATCH 53/57] xvba: do not create decoder for surfaces larger than
Subject: [PATCH 54/58] xvba: do not create decoder for surfaces larger than
width 2048 or height 1536
---
@ -18177,10 +18227,10 @@ index e8e376a..b73c48a 100644
1.7.10
From bc33be31726f0e272b72a992db89f6c20cd2b1dc Mon Sep 17 00:00:00 2001
From 7716a8fd17116103cc43c573de398038a614c79e Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Sun, 4 Nov 2012 16:24:10 +0100
Subject: [PATCH 54/57] xvba: add string for available decoders - we are
Subject: [PATCH 55/58] xvba: add string for available decoders - we are
important so make sure we are there
---
@ -18207,10 +18257,10 @@ index 0cea7a9..6fb74b7 100644
1.7.10
From 481c15f0838215a44d322f2ec80ad5623164fe36 Mon Sep 17 00:00:00 2001
From a8a42001b07528e79758bfc79717c95f3282dc58 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Thu, 22 Nov 2012 21:32:21 +0100
Subject: [PATCH 55/57] xvba: revisit Artefacts. There are more broken video
Subject: [PATCH 56/58] xvba: revisit Artefacts. There are more broken video
files out there
---
@ -18244,10 +18294,10 @@ index a077442..87af687 100644
1.7.10
From d23af01a68db3ebed2fff0b6072646e733997e3b Mon Sep 17 00:00:00 2001
From 5bad32f250578a0ff23a1424039f6acfd43e7f08 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 23 Nov 2012 09:42:02 +0100
Subject: [PATCH 56/57] xvba: reactivate accidently disabled
Subject: [PATCH 57/58] xvba: reactivate accidently disabled
IsDecodingFinished
---
@ -18271,10 +18321,10 @@ index b73c48a..47ff25f 100644
1.7.10
From af4bbe389639cfdf38b3945bb89f47dd15a1340a Mon Sep 17 00:00:00 2001
From 77888a23dd4c76d67481e7e964b0c862403b52c5 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 23 Nov 2012 17:41:12 +0100
Subject: [PATCH 57/57] xrandr: fix query for multiple screens
Subject: [PATCH 58/58] xrandr: fix query for multiple screens
---
xbmc/windowing/X11/XRandR.cpp | 10 ++++++----