From b1d2f799607885594db5564c92bf87ecbe789db7 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 17 Sep 2015 13:51:05 +0100
Subject: [PATCH] squash: Fix compile errors on pi

---
 .../VideoRenderers/LinuxRendererGLES.cpp          |  4 ++--
 .../VideoPlayer/VideoRenderers/RenderManager.cpp  | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
index fce23c5a20b1d..1ce10085c3ddd 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
@@ -227,8 +227,8 @@ int CLinuxRendererGLES::GetImage(YV12Image *image, int source, bool readonly)
   if( source == AUTOSOURCE )
    source = NextYV12Texture();
 
- 
-  if ((int hwSource = GetImageHook(image, source, readonly)) != NOSOURCE)
+  int hwSource = GetImageHook(image, source, readonly);
+  if (hwSource != NOSOURCE)
   {
     return hwSource;
   }
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
index 121c22c7d93f3..37d5214fe555c 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -43,10 +43,11 @@
 #if defined(TARGET_DARWIN_OSX)
 #include "HwDecRender/RendererVDA.h"
 #endif
-#elif defined(HAS_MMAL)
-  #include "HwDecRender/MMALRenderer.h"
 #elif HAS_GLES == 2
   #include "LinuxRendererGLES.h"
+#if defined(HAS_MMAL)
+#include "HwDecRender/MMALRenderer.h"
+#endif
 #if defined(HAVE_VIDEOTOOLBOXDECODER)
 #include "HWDecRender/RendererVTB.h"
 #endif
@@ -669,7 +670,7 @@ void CRenderManager::CreateRenderer()
       m_pRenderer = new CRendererMediaCodec;
 #endif
     }
-    if (m_format == RENDER_FMT_MMAL)
+    else if (m_format == RENDER_FMT_MMAL)
     {
 #if defined(HAS_MMAL)
       m_pRenderer = new CMMALRenderer
@@ -687,7 +688,7 @@ void CRenderManager::CreateRenderer()
       m_pRenderer = new CRendererOMX;
 #endif
     }
-    else if (m_format != RENDER_FMT_DXVA)
+    else if (m_format == RENDER_FMT_DXVA)
     {
 #if defined(HAS_DX)
       m_pRenderer = new CWinRenderer();
@@ -695,12 +696,14 @@ void CRenderManager::CreateRenderer()
     }
     else if (m_format != RENDER_FMT_NONE)
     {
-#if defined(HAS_GL)
+#if defined(HAS_MMAL)
+      m_pRenderer = new CMMALRenderer;
+#elif defined(HAS_GL)
       m_pRenderer = new CLinuxRendererGL;
 #elif HAS_GLES == 2
       m_pRenderer = new CLinuxRendererGLES;
 #elif defined(HAS_DX)
-  m_pRenderer = new CWinRenderer();
+      m_pRenderer = new CWinRenderer();
 #endif
     }
     if (m_pRenderer)