Anonymous

diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cppindex 1c4976d..987500d 100644--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp@@ -958,7 +958,7 @@ void CLinuxRendererGL::LoadShaders(int field)   bool err = false;  #ifdef HAVE_LIBVDPAU-  if (g_VDPAU)+  if ((requestedMethod == RENDER_METHOD_AUTO || requestedMethod == RENDER_METHOD_VDPAU) && g_VDPAU)   {     CLog::Log(LOGNOTICE, "GL: Using VDPAU render method");     m_renderMethod = RENDER_VDPAU;diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cppindex 2ef8427..712486f 100644--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp@@ -95,7 +95,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options  #ifdef HAVE_LIBVDPAU   int requestedMethod = g_guiSettings.GetInt("videoplayer.rendermethod");-  if(requestedMethod == RENDER_METHOD_VDPAU+  if((requestedMethod == RENDER_METHOD_AUTO || requestedMethod == RENDER_METHOD_VDPAU)   && !hints.software)   {     while((pCodec = m_dllAvCodec.av_codec_next(pCodec)))