Merge pull request #291 from popcornmix/fernetfixes

squash: Fix compile errors on pi
FernetMenta · Sep 17, 2015 · f6782f9 · f6782f9
2 parents 71dc3a3 + b1d2f79
commit f6782f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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,20 +688,22 @@ 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();
 #endif
     }
     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)