Merge pull request #4270 from MartijnKaijser/addondisabled
authorjmarshallnz <jcmarsha@gmail.com>
Sun, 23 Feb 2014 20:01:45 +0000 (09:01 +1300)
committerjmarshallnz <jcmarsha@gmail.com>
Sun, 23 Feb 2014 20:01:45 +0000 (09:01 +1300)
[language] split of "Add-on disabled" string after d688682

xbmc/cores/VideoRenderers/LinuxRendererGL.cpp

index 08a261a..f37d090 100644 (file)
@@ -48,6 +48,7 @@
 #include "RenderCapture.h"
 #include "RenderFormats.h"
 #include "cores/IPlayer.h"
+#include "cores/dvdplayer/DVDCodecs/DVDCodecUtils.h"
 
 #ifdef HAVE_LIBVDPAU
 #include "cores/dvdplayer/DVDCodecs/Video/VDPAU.h"
@@ -3116,9 +3117,11 @@ void CLinuxRendererGL::ToRGBFrame(YV12Image* im, unsigned flipIndexPlane, unsign
   int      srcStride[4] = {};
   int      srcFormat    = -1;
 
-  if (m_format == RENDER_FMT_YUV420P)
+  if (m_format == RENDER_FMT_YUV420P ||
+      m_format == RENDER_FMT_YUV420P10 ||
+      m_format == RENDER_FMT_YUV420P16)
   {
-    srcFormat = PIX_FMT_YUV420P;
+    srcFormat = CDVDCodecUtils::PixfmtFromEFormat(m_format);
     for (int i = 0; i < 3; i++)
     {
       src[i]       = im->plane[i];