Merge pull request #686 from vpeter4/imx6-krypton

projects/imx6: small fixes for kodi master
This commit is contained in:
Christian Hewitt 2016-09-03 12:54:39 +04:00 committed by GitHub
commit 347de5f981
2 changed files with 26 additions and 18593 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,26 @@
diff -aurNp a/xbmc/linux/imx/IMX.cpp b/xbmc/linux/imx/IMX.cpp
--- a/xbmc/linux/imx/IMX.cpp 2016-08-21 23:42:23.000000000 +0200
+++ b/xbmc/linux/imx/IMX.cpp 2016-09-02 12:51:09.516633817 +0200
@@ -198,11 +198,6 @@ bool CIMXFps::Recalc()
double frameNorm = CDVDCodecUtils::NormalizeFrameduration(frameDuration, &hasMatch);
- if (hasMatch && !patternLength)
- m_patternLength = 1;
- else
- m_patternLength = patternLength;
-
if (!m_hasPattern && hasMatch)
m_frameDuration = frameNorm;
diff -aurNp a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp
--- a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2016-08-21 23:42:23.000000000 +0200
+++ b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2016-09-02 12:42:54.443140655 +0200
@@ -29,6 +29,7 @@
#include <sys/ioctl.h>
#ifdef HAS_IMXVPU
#include <linux/mxcfb.h>
+#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h"
#endif
#include "utils/log.h"
#include "utils/RegExp.h"