diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 04239a6f7a..dd30c51f65 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.1.2"
+PKG_VERSION="12.1.3"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="17411f2"
 fi
diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.2/xbmc-theme-Confluence-990.07-PR2449-2.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.3/xbmc-theme-Confluence-990.07-PR2449-2.patch
similarity index 100%
rename from packages/mediacenter/xbmc-theme-Confluence/patches/12.1.2/xbmc-theme-Confluence-990.07-PR2449-2.patch
rename to packages/mediacenter/xbmc-theme-Confluence/patches/12.1.3/xbmc-theme-Confluence-990.07-PR2449-2.patch
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 0399d0bb19..5f304aeefb 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.1.2"
+PKG_VERSION="12.1.3"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="17411f2"
 fi
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.15-PR2323.patch b/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.15-PR2323.patch
deleted file mode 100644
index d8e6762441..0000000000
--- a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.15-PR2323.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- xbmc-12.0.3/configure.in.orig	2013-03-01 13:21:58.791312360 +0100
-+++ xbmc-12.0.3/configure.in	2013-03-01 13:38:41.138311757 +0100
-@@ -990,9 +990,15 @@
- AC_CHECK_LIB([tiff],        [main],, AC_MSG_ERROR($missing_library))
- if echo "$ARCH" | grep -q freebsd; then
- AC_CHECK_LIB([pthread],     [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library))
-+AC_CHECK_LIB([pthread],     [pthread_set_name_np],
-+  AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP],[1],["Define to 1 if pthread has pthread_set_name_np"]),
-+  AC_MSG_RESULT([Could not find pthread_set_name_np in pthread]))
- else
- if test "$target_platform" != "target_android" ; then
-   AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
-+  AC_CHECK_LIB([pthread],     [pthread_setname_np],
-+    AC_DEFINE([HAVE_PTHREAD_SETNAME_NP],[1],["Define to 1 if pthread has pthread_setname_np"]),
-+    AC_MSG_RESULT([Could not find pthread_setname_np in pthread]))
- fi
- fi
- AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
---- xbmc-12.0.3/xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2013-03-01 14:40:50.080309513 +0100
-+++ xbmc-12.0.3/xbmc/threads/platform/pthreads/ThreadImpl.cpp	2013-03-01 14:40:20.548309531 +0100
-@@ -18,6 +18,9 @@
-  *
-  */
- 
-+#if (defined HAVE_CONFIG_H) && (!defined WIN32)
-+  #include "config.h"
-+#endif
- #include <limits.h>
- #if defined(TARGET_ANDROID)
- #include <unistd.h>
-@@ -71,10 +74,16 @@
-   m_ThreadOpaque.LwpId = syscall(SYS_gettid);
- #endif
- 
-+#if defined(HAVE_PTHREAD_SETNAME_NP)
- #ifdef TARGET_DARWIN
- #if(__MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30200)
-   pthread_setname_np(m_ThreadName.c_str());
- #endif
-+#else
-+  pthread_setname_np(m_ThreadId, m_ThreadName.c_str());
-+#endif
-+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
-+  pthread_set_name_np(m_ThreadId, m_ThreadName.c_str());
- #endif
-     
- #ifdef RLIMIT_NICE
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.44-PR2549.patch b/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.44-PR2549.patch
deleted file mode 100644
index f3681b6c80..0000000000
--- a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.44-PR2549.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Naur xbmc-12.1/xbmc/cores/omxplayer/OMXImage.cpp xbmc-12.1.patch/xbmc/cores/omxplayer/OMXImage.cpp
---- xbmc-12.1/xbmc/cores/omxplayer/OMXImage.cpp	2013-03-18 04:42:24.000000000 +0100
-+++ xbmc-12.1.patch/xbmc/cores/omxplayer/OMXImage.cpp	2013-04-06 21:56:20.697642093 +0200
-@@ -487,30 +487,47 @@
- {
-   RESOLUTION_INFO& res_info =  g_settings.m_ResInfo[g_graphicsContext.GetVideoResolution()];
-   const bool transposed = m_orientation & 4;
--  const int gui_width  = transposed ? res_info.iHeight:res_info.iWidth;
--  const int gui_height = transposed ? res_info.iWidth:res_info.iHeight;
--  const unsigned int max_width  = min(gui_width, 2048);
--  const unsigned int max_height = min(gui_height, 2048);
--
--  if(!max_width || !max_height)
--    return false;
-+  unsigned int max_width = width;
-+  unsigned int max_height = height;
-+  const unsigned int gui_width  = transposed ? res_info.iHeight:res_info.iWidth;
-+  const unsigned int gui_height = transposed ? res_info.iWidth:res_info.iHeight;
-+  const float aspect = (float)m_width / m_height;
- 
--  const float ar = (float)width/(float)height;
--  // bigger than maximum, so need to clamp
--  if (width > max_width || height > max_height) {
--    // wider than max, so clamp width first
--    if (ar > (float)max_width/(float)max_height)
--    {
--      width = max_width;
--      height = (float)max_width / ar + 0.5f;
--    // taller than max, so clamp height first
--    } else {
--      height = max_height;
--      width = (float)max_height * ar + 0.5f;
-+  if (max_width == 0 || max_height == 0)
-+  {
-+    max_height = g_advancedSettings.m_imageRes;
-+
-+    if (g_advancedSettings.m_fanartRes > g_advancedSettings.m_imageRes)
-+    { // a separate fanart resolution is specified - check if the image is exactly equal to this res
-+      if (fabsf(aspect / (16.0f/9.0f) - 1.0f) <= 0.01f && m_height >= g_advancedSettings.m_fanartRes)
-+      { // special case for 16x9 images larger than the fanart res
-+        max_height = g_advancedSettings.m_fanartRes;
-+      }
-     }
--    return true;
-+    max_width = max_height * 16/9;
-   }
- 
-+  if (gui_width)
-+    max_width = min(max_width, gui_width);
-+  if (gui_height)
-+    max_height = min(max_height, gui_height);
-+
-+  max_width  = min(max_width, 2048U);
-+  max_height = min(max_height, 2048U);
-+
-+
-+  width = m_width;
-+  height = m_height;
-+  if (width > max_width || height > max_height)
-+  {
-+    if ((unsigned int)(max_width / aspect + 0.5f) > max_height)
-+      max_width = (unsigned int)(max_height * aspect + 0.5f);
-+    else
-+      max_height = (unsigned int)(max_width / aspect + 0.5f);
-+    width = max_width;
-+    height = max_height;
-+    return true;
-+  }
-   return false;
- }
- 
-@@ -549,7 +566,6 @@
-     CLog::Log(LOGERROR, "%s::%s %s m_width=%d m_height=%d\n", CLASSNAME, __func__, inputFile.c_str(), m_width, m_height);
-     return false;
-   }
--  ClampLimits(m_width, m_height);
- 
-   m_is_open = true;
- 
-@@ -719,25 +735,6 @@
- 
-   m_decoder_open = true;
- 
--  if(width == 0 || height == 0)
--  {
--    height = g_advancedSettings.m_imageRes;
--    if (g_advancedSettings.m_fanartRes > g_advancedSettings.m_imageRes)
--    { // a separate fanart resolution is specified - check if the image is exactly equal to this res
--      if (m_width == (unsigned int)g_advancedSettings.m_fanartRes * 16/9 &&
--          m_height == (unsigned int)g_advancedSettings.m_fanartRes)
--      { // special case for fanart res
--        height = g_advancedSettings.m_fanartRes;
--      }
--    }
--    width = height * 16/9;
--    if(!width || !height)
--    {
--      width = g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iWidth;
--      height = g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution].iHeight;
--    }
--  }
--
-   ClampLimits(width, height);
- 
-   // set input format
-diff -Naur xbmc-12.1/xbmc/guilib/Texture.cpp xbmc-12.1.patch/xbmc/guilib/Texture.cpp
---- xbmc-12.1/xbmc/guilib/Texture.cpp	2013-03-18 04:42:22.000000000 +0100
-+++ xbmc-12.1.patch/xbmc/guilib/Texture.cpp	2013-04-06 21:54:12.381273419 +0200
-@@ -224,7 +224,7 @@
- 
-     if(omx_image.ReadFile(texturePath))
-     {
--      if(omx_image.Decode(omx_image.GetWidth(), omx_image.GetHeight()))
-+      if(omx_image.Decode(maxWidth, maxHeight))
-       {
-         Allocate(omx_image.GetDecodedWidth(), omx_image.GetDecodedHeight(), XB_FMT_A8R8G8B8);
- 
-diff -Naur xbmc-12.1/xbmc/pictures/Picture.cpp xbmc-12.1.patch/xbmc/pictures/Picture.cpp
---- xbmc-12.1/xbmc/pictures/Picture.cpp	2013-03-18 04:42:24.000000000 +0100
-+++ xbmc-12.1.patch/xbmc/pictures/Picture.cpp	2013-04-06 21:54:12.381273419 +0200
-@@ -104,7 +104,7 @@
-   uint32_t max_height = g_advancedSettings.m_imageRes;
-   if (g_advancedSettings.m_fanartRes > g_advancedSettings.m_imageRes)
-   { // a separate fanart resolution is specified - check if the image is exactly equal to this res
--    if (width * 9 == height * 16 && height >= g_advancedSettings.m_fanartRes)
-+    if (fabsf((float)width / (float)height / (16.0f/9.0f) - 1.0f) <= 0.01f && height >= g_advancedSettings.m_fanartRes)
-     { // special case for 16x9 images larger than the fanart res
-       max_height = g_advancedSettings.m_fanartRes;
-     }
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.46-PR2539.patch b/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.46-PR2539.patch
deleted file mode 100644
index 36077fed9c..0000000000
--- a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.46-PR2539.patch
+++ /dev/null
@@ -1,726 +0,0 @@
-From 11cdffa95a963c8dc07a696c0036cf0213a5d2fd Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 12:43:16 +0000
-Subject: [PATCH 01/11] [rbp] Add reporting of fifo fullness for use with
- hdmi_status_show in debug builds
-
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index c09569b..7dd6654 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -1064,6 +1064,22 @@ void COMXPlayer::Process()
- 
-   while (!m_bAbortRequest)
-   {
-+    #ifdef _DEBUG
-+    char response[80];
-+    static unsigned count;
-+    if ((count++ & 15) == 0)
-+    {
-+      vc_gencmd(response, sizeof response, "render_bar 4 video_fifo %d %d %d %d",
-+            m_player_video.GetDecoderBufferSize()-m_player_video.GetDecoderFreeSpace(),
-+            0 , 0, m_player_video.GetDecoderBufferSize());
-+      vc_gencmd(response, sizeof response, "render_bar 5 audio_fifo %d %d %d %d",
-+            (int)(100.0*m_player_audio.GetDelay()), 0, 0, 100*AUDIO_BUFFER_SECONDS);
-+      vc_gencmd(response, sizeof response, "render_bar 6 video_queue %d %d %d %d",
-+            m_player_video.GetLevel(), 0, 0, 100);
-+      vc_gencmd(response, sizeof response, "render_bar 7 audio_queue %d %d %d %d",
-+            m_player_audio.GetLevel(), 0, 0, 100);
-+    }
-+    #endif
-     // handle messages send to this thread, like seek or demuxer reset requests
-     HandleMessages();
- 
--- 
-1.8.1.5
-
-
-From dc463479660aa992af80b7114d9d2f12ed3bb75a Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 12:47:01 +0000
-Subject: [PATCH 02/11] [rbp] Move m_messenger.Init from constructor to
- OnStartup
-
-This makes omxplayer constistent with dvdplayer.
-It avoids an initial stray message to immediately try and go normal speed when it should be buffering.
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 7dd6654..4ea922c 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -433,8 +433,6 @@ void COMXSelectionStreams::Update(CDVDInputStream* input, CDVDDemux* demuxer)
-   m_EdlAutoSkipMarkers.Clear();
- 
-   memset(&m_SpeedState, 0, sizeof(m_SpeedState));
--
--  m_messenger.Init();
- }
- 
- COMXPlayer::~COMXPlayer()
-@@ -559,6 +557,8 @@ void COMXPlayer::OnStartup()
-   m_CurrentSubtitle.Clear();
-   m_CurrentTeletext.Clear();
- 
-+  m_messenger.Init();
-+
-   CUtil::ClearTempFonts();
- }
- 
--- 
-1.8.1.5
-
-
-From d1b6df908b5a4033a2052d6d03adcc7512a6cc42 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 12:57:16 +0000
-Subject: [PATCH 03/11] [rbp] Expose GetAudioRenderingLatency
-
-This could be useful for detecting underrun conditions
----
- xbmc/cores/omxplayer/OMXAudio.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h
-index d812e0a..4b08722 100644
---- a/xbmc/cores/omxplayer/OMXAudio.h
-+++ b/xbmc/cores/omxplayer/OMXAudio.h
-@@ -94,6 +94,7 @@ class COMXAudio
-   unsigned int SyncAC3(BYTE* pData, unsigned int iSize);
- 
-   bool BadState() { return !m_Initialized; };
-+  unsigned int GetAudioRenderingLatency();
- 
- private:
-   IAudioCallback* m_pCallback;
-@@ -148,7 +149,6 @@ class COMXAudio
-   CAEChannelInfo    GetChannelLayout(AEAudioFormat format);
- 
-   void CheckOutputBufferSize(void **buffer, int *oldSize, int newSize);
--  unsigned int GetAudioRenderingLatency();
-   CCriticalSection m_critSection;
- };
- #endif
--- 
-1.8.1.5
-
-
-From 8e6ebfd69bb25995132803feb33e2058feefb8bc Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 13:49:05 +0000
-Subject: [PATCH 04/11] [rbp] Add OMXLateCount to query if packets have arrived
- late
-
-Could be useful for detecting underrun conditions
----
- xbmc/linux/OMXClock.cpp | 32 ++++++++++++++++++++++++++++++++
- xbmc/linux/OMXClock.h   |  1 +
- 2 files changed, 33 insertions(+)
-
-diff --git a/xbmc/linux/OMXClock.cpp b/xbmc/linux/OMXClock.cpp
-index 54ccf31..3860818 100644
---- a/xbmc/linux/OMXClock.cpp
-+++ b/xbmc/linux/OMXClock.cpp
-@@ -791,6 +791,38 @@ bool OMXClock::OMXMediaTime(double pts, bool fixPreroll /* = true*/, bool lock /
-   return true;
- }
- 
-+// gets count of late frames, indicating underrun has occurred
-+int OMXClock::OMXLateCount(int port /* true */ , bool lock /* = true */)
-+{
-+  if(m_omx_clock.GetComponent() == NULL)
-+    return 0;
-+
-+  if(lock)
-+    Lock();
-+
-+  OMX_ERRORTYPE omx_err = OMX_ErrorNone;
-+
-+  OMX_PARAM_U32TYPE late;
-+  OMX_INIT_STRUCTURE(late);
-+  late.nPortIndex = m_omx_clock.GetInputPort()+port;
-+
-+  omx_err = m_omx_clock.GetConfig(OMX_IndexConfigBrcmClockMissCount, &late);
-+  if(omx_err != OMX_ErrorNone)
-+  {
-+    CLog::Log(LOGERROR, "OMXClock::OMXLateCount error getting OMX_IndexConfigBrcmClockMissCount(%d)\n", port);
-+    if(lock)
-+      UnLock();
-+    return 0;
-+  }
-+
-+  //CLog::Log(LOGINFO, "OMXClock::OMXLateCount(%d)=%d", port, late.nU32);
-+
-+  if(lock)
-+    UnLock();
-+
-+  return late.nU32;
-+}
-+
- bool OMXClock::OMXPause(bool lock /* = true */)
- {
-   if(m_omx_clock.GetComponent() == NULL)
-diff --git a/xbmc/linux/OMXClock.h b/xbmc/linux/OMXClock.h
-index 3001d86..a969e17 100644
---- a/xbmc/linux/OMXClock.h
-+++ b/xbmc/linux/OMXClock.h
-@@ -117,6 +117,7 @@ class OMXClock
-   double OMXWallTime(bool lock = true);
-   double OMXMediaTime(bool fixPreroll = true, bool lock = true);
-   bool OMXMediaTime(double pts, bool fixPreroll = true, bool lock = true);
-+  int OMXLateCount(int port, bool lock = true);
-   bool OMXPause(bool lock = true);
-   bool OMXResume(bool lock = true);
-   bool OMXUpdateClock(double pts, bool lock = true);
--- 
-1.8.1.5
-
-
-From 9c9ecc9b80b62b1ed0e819b4a74b8ed6a3d4e5bc Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 1 Apr 2013 18:02:31 +0100
-Subject: [PATCH 05/11] [rbp] Add more debug logging
-
----
- xbmc/cores/omxplayer/OMXAudio.cpp       |  1 +
- xbmc/cores/omxplayer/OMXPlayer.cpp      | 23 ++++++++++++++++++++++-
- xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 12 ++++++++++--
- xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 15 ++++++++++++---
- xbmc/cores/omxplayer/OMXVideo.cpp       |  1 +
- xbmc/linux/OMXCore.cpp                  | 16 ++++++++--------
- 6 files changed, 54 insertions(+), 14 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
-index 10c3329..d03d4a0 100644
---- a/xbmc/cores/omxplayer/OMXAudio.cpp
-+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
-@@ -908,6 +908,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
-       omx_err = m_omx_decoder.EmptyThisBuffer(omx_buffer);
-       if (omx_err == OMX_ErrorNone)
-       {
-+        //CLog::Log(LOGINFO, "AudiD: dts:%.0f pts:%.0f size:%d\n", dts, pts, len);
-         break;
-       }
-       else
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 4ea922c..6ec0289 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -1091,6 +1091,7 @@ void COMXPlayer::Process()
-     {
-       if (OpenInputStream() == false)
-       {
-+        CLog::Log(LOGERROR, "%s - Closing stream due to OpenInputStream()", __FUNCTION__);
-         m_bAbortRequest = true;
-         break;
-       }
-@@ -1107,6 +1108,7 @@ void COMXPlayer::Process()
- 
-       if (OpenDemuxStream() == false)
-       {
-+        CLog::Log(LOGERROR, "%s - Closing stream due to OpenDemuxStream()", __FUNCTION__);
-         m_bAbortRequest = true;
-         break;
-       }
-@@ -1136,6 +1138,7 @@ void COMXPlayer::Process()
-     // OMX emergency exit
-     if(HasAudio() && m_player_audio.BadState())
-     {
-+      CLog::Log(LOGERROR, "%s - Closing stream due to m_player_audio.BadState()", __FUNCTION__);
-       m_bAbortRequest = true;
-       break;
-     }
-@@ -1767,6 +1770,7 @@ bool COMXPlayer::CheckPlayerInit(COMXCurrentStream& current, unsigned int source
- 
- void COMXPlayer::UpdateCorrection(DemuxPacket* pkt, double correction)
- {
-+  //CLog::Log(LOGINFO,"%s: %d dts:%.0f pts:%.0f s:%d c:%.0f (%d,%d)", __func__, (int)pkt->iStreamId, pkt->dts, pkt->pts, pkt->iSize, correction, pkt->dts==DVD_NOPTS_VALUE, pkt->pts==DVD_NOPTS_VALUE);
-   if(pkt->dts != DVD_NOPTS_VALUE) pkt->dts -= correction;
-   if(pkt->pts != DVD_NOPTS_VALUE) pkt->pts -= correction;
- }
-@@ -2123,7 +2127,7 @@ void COMXPlayer::HandleMessages()
-         CLog::Log(LOGDEBUG, "demuxer seek to: %d", time);
-         if (m_pDemuxer && m_pDemuxer->SeekTime(time, msg.GetBackward(), &start))
-         {
--          CLog::Log(LOGDEBUG, "demuxer seek to: %d, success", time);
-+          CLog::Log(LOGDEBUG, "demuxer seek to: %.0f, success", start);
-           if(m_pSubtitleDemuxer)
-           {
-             if(!m_pSubtitleDemuxer->SeekTime(time, msg.GetBackward()))
-@@ -2858,6 +2862,7 @@ int64_t COMXPlayer::GetTime()
-     if(offset >  limit) offset =  limit;
-     if(offset < -limit) offset = -limit;
-   }
-+  //{CLog::Log(LOGINFO, "%s: time:%.2f stamp:%.2f dts:%d m:%d (p:%d,c:%d) =%llu", __func__, (double)m_State.time, (double)m_State.timestamp, (int)DVD_TIME_TO_MSEC(m_State.dts + m_offset_pts), (int)DVD_TIME_TO_MSEC(m_av_clock.OMXMediaTime()), (int)m_playSpeed, (int)m_caching, llrint(m_State.time + DVD_TIME_TO_MSEC(offset)));}
-   return llrint(m_State.time + DVD_TIME_TO_MSEC(offset));
- }
- 
-@@ -2892,11 +2897,17 @@ bool COMXPlayer::OpenAudioStream(int iStream, int source, bool reset)
-   CLog::Log(LOGNOTICE, "Opening audio stream: %i source: %i", iStream, source);
- 
-   if (!m_pDemuxer)
-+  {
-+    CLog::Log(LOGWARNING, "Opening audio stream: no demuxer");
-     return false;
-+  }
- 
-   CDemuxStream* pStream = m_pDemuxer->GetStream(iStream);
-   if (!pStream || pStream->disabled)
-+  {
-+    CLog::Log(LOGWARNING, "Opening audio stream: pStream=%p disabled=%d", pStream, pStream ? pStream->disabled:0);
-     return false;
-+  }
- 
-   if( m_CurrentAudio.id < 0 &&  m_CurrentVideo.id >= 0 )
-   {
-@@ -2953,11 +2964,17 @@ bool COMXPlayer::OpenVideoStream(int iStream, int source, bool reset)
-   CLog::Log(LOGNOTICE, "Opening video stream: %i source: %i", iStream, source);
- 
-   if (!m_pDemuxer)
-+  {
-+    CLog::Log(LOGWARNING, "Opening video stream: no demuxer");
-     return false;
-+  }
- 
-   CDemuxStream* pStream = m_pDemuxer->GetStream(iStream);
-   if(!pStream || pStream->disabled)
-+  {
-+    CLog::Log(LOGWARNING, "Opening video stream: pStream=%p disabled=%d", pStream, pStream ? pStream->disabled:0);
-     return false;
-+  }
-   pStream->SetDiscard(AVDISCARD_NONE);
- 
-   CDVDStreamInfo hint(*pStream, true);
-@@ -3238,6 +3255,9 @@ bool COMXPlayer::CloseTeletextStream(bool bWaitForBuffers)
- void COMXPlayer::FlushBuffers(bool queued, double pts, bool accurate)
- {
-   double startpts;
-+
-+  CLog::Log(LOGNOTICE, "FlushBuffers: q:%d pts:%.0f a:%d", queued, pts, accurate);
-+
-   if(accurate)
-     startpts = pts;
-   else
-@@ -4098,6 +4118,7 @@ void COMXPlayer::UpdatePlayState(double timeout)
-     state.cache_bytes = 0;
- 
-   state.timestamp = m_av_clock.GetAbsoluteClock();
-+  //{CLog::Log(LOGINFO, "%s: time:%.2f stamp:%.2f dts:%d m:%d (p:%d,c:%d) =%llu", __func__, (double)state.time, (double)state.timestamp, (int)DVD_TIME_TO_MSEC(state.dts + m_offset_pts), (int)DVD_TIME_TO_MSEC(m_av_clock.OMXMediaTime()), (int)m_playSpeed, (int)m_caching, llrint(state.time + DVD_TIME_TO_MSEC(offset)));}
- 
-   CSingleLock lock(m_StateSection);
-   m_StateInput = state;
-diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-index 04590c7..178edaf 100644
---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-@@ -493,6 +493,10 @@ void OMXPlayerAudio::Process()
-       DemuxPacket* pPacket = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacket();
-       bool bPacketDrop     = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacketDrop();
- 
-+      #ifdef _DEBUG
-+      CLog::Log(LOGINFO, "Audio: dts:%.0f pts:%.0f size:%d (s:%d f:%d d:%d l:%d) s:%d %d/%d late:%d,%d", pPacket->dts, pPacket->pts,
-+           (int)pPacket->iSize, m_started, m_flush, bPacketDrop, m_stalled, m_speed, 0, 0, (int)m_omxAudio.GetAudioRenderingLatency(), (int)m_hints_current.samplerate);
-+      #endif
-       if(Decode(pPacket, m_speed > DVD_PLAYSPEED_NORMAL || m_speed < 0 || bPacketDrop))
-       {
-         if (m_stalled && (m_omxAudio.GetCacheTime() > (AUDIO_BUFFER_SECONDS * 0.75f)))
-@@ -566,6 +570,7 @@ void OMXPlayerAudio::Process()
-     }
-     else if (pMsg->IsType(CDVDMsg::PLAYER_STARTED))
-     {
-+      CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::PLAYER_STARTED %d", m_started);
-       if(m_started)
-         m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_AUDIO));
-     }
-@@ -603,8 +608,11 @@ void OMXPlayerAudio::Process()
-     }
-     else if (pMsg->IsType(CDVDMsg::PLAYER_SETSPEED))
-     {
--      CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::PLAYER_SETSPEED");
--      m_speed = static_cast<CDVDMsgInt*>(pMsg)->m_value;
-+      if (m_speed != static_cast<CDVDMsgInt*>(pMsg)->m_value)
-+      {
-+        m_speed = static_cast<CDVDMsgInt*>(pMsg)->m_value;
-+        CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::PLAYER_SETSPEED %d", m_speed);
-+      }
-       if (m_speed != DVD_PLAYSPEED_NORMAL)
-       {
-         m_syncclock = true;
-diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-index 45fc51f..e8c9cff 100644
---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-@@ -378,7 +378,7 @@ void OMXPlayerVideo::Process()
- 
-     if (MSGQ_IS_ERROR(ret) || ret == MSGQ_ABORT)
-     {
--      CLog::Log(LOGERROR, "Got MSGQ_ABORT or MSGO_IS_ERROR return true");
-+      CLog::Log(LOGERROR, "OMXPlayerVideo: Got MSGQ_IS_ERROR(%d) Aborting", (int)ret);
-       break;
-     }
-     else if (ret == MSGQ_TIMEOUT)
-@@ -455,8 +455,8 @@ void OMXPlayerVideo::Process()
-     }
-     else if (pMsg->IsType(CDVDMsg::VIDEO_SET_ASPECT))
-     {
--      CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::VIDEO_SET_ASPECT");
-       m_fForcedAspectRatio = *((CDVDMsgDouble*)pMsg);
-+      CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::VIDEO_SET_ASPECT %.2f", m_fForcedAspectRatio);
-     }
-     else if (pMsg->IsType(CDVDMsg::GENERAL_RESET))
-     {
-@@ -484,10 +484,15 @@ void OMXPlayerVideo::Process()
-     }
-     else if (pMsg->IsType(CDVDMsg::PLAYER_SETSPEED))
-     {
--      m_speed = static_cast<CDVDMsgInt*>(pMsg)->m_value;
-+      if (m_speed != static_cast<CDVDMsgInt*>(pMsg)->m_value)
-+      {
-+        m_speed = static_cast<CDVDMsgInt*>(pMsg)->m_value;
-+        CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::PLAYER_SETSPEED %d", m_speed);
-+      }
-     }
-     else if (pMsg->IsType(CDVDMsg::PLAYER_STARTED))
-     {
-+      CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::PLAYER_STARTED %d", m_started);
-       if(m_started)
-         m_messageParent.Put(new CDVDMsgInt(CDVDMsg::PLAYER_STARTED, DVDPLAYER_VIDEO));
-     }
-@@ -519,6 +524,10 @@ void OMXPlayerVideo::Process()
-       DemuxPacket* pPacket = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacket();
-       bool bPacketDrop     = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacketDrop();
- 
-+      #ifdef _DEBUG
-+      CLog::Log(LOGINFO, "Video: dts:%.0f pts:%.0f size:%d (s:%d f:%d d:%d l:%d) s:%d %d/%d late:%d\n", pPacket->dts, pPacket->pts, 
-+          (int)pPacket->iSize, m_started, m_flush, bPacketDrop, m_stalled, m_speed, 0, 0, m_av_clock->OMXLateCount(1));
-+      #endif
-       if (m_messageQueue.GetDataSize() == 0
-       ||  m_speed < 0)
-       {
-diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
-index 15bc8fa..959422b 100644
---- a/xbmc/cores/omxplayer/OMXVideo.cpp
-+++ b/xbmc/cores/omxplayer/OMXVideo.cpp
-@@ -835,6 +835,7 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
-         omx_err = m_omx_decoder.EmptyThisBuffer(omx_buffer);
-         if (omx_err == OMX_ErrorNone)
-         {
-+          //CLog::Log(LOGINFO, "VideD: dts:%.0f pts:%.0f size:%d)\n", dts, pts, iSize);
-           break;
-         }
-         else
-diff --git a/xbmc/linux/OMXCore.cpp b/xbmc/linux/OMXCore.cpp
-index 5e582cc..4946b1d 100644
---- a/xbmc/linux/OMXCore.cpp
-+++ b/xbmc/linux/OMXCore.cpp
-@@ -644,7 +644,7 @@ OMX_ERRORTYPE COMXCoreComponent::AllocInputBuffers(bool use_buffers /* = false *
-   m_input_buffer_count  = portFormat.nBufferCountActual;
-   m_input_buffer_size   = portFormat.nBufferSize;
- 
--  CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocInputBuffers component(%s) - port(%d), nBufferCountMin(%lu), nBufferCountActual(%lu), nBufferSize(%lu), nBufferAlignmen(%lu)\n",
-+  CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocInputBuffers component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u), nBufferAlignmen(%u)\n",
-             m_componentName.c_str(), GetInputPort(), portFormat.nBufferCountMin,
-             portFormat.nBufferCountActual, portFormat.nBufferSize, portFormat.nBufferAlignment);
- 
-@@ -720,7 +720,7 @@ OMX_ERRORTYPE COMXCoreComponent::AllocOutputBuffers(bool use_buffers /* = false
-   m_output_buffer_count  = portFormat.nBufferCountActual;
-   m_output_buffer_size   = portFormat.nBufferSize;
- 
--  CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocOutputBuffers component(%s) - port(%d), nBufferCountMin(%lu), nBufferCountActual(%lu), nBufferSize(%lu) nBufferAlignmen(%lu)\n",
-+  CLog::Log(LOGDEBUG, "COMXCoreComponent::AllocOutputBuffers component(%s) - port(%d), nBufferCountMin(%u), nBufferCountActual(%u), nBufferSize(%u) nBufferAlignmen(%u)\n",
-             m_componentName.c_str(), m_output_port, portFormat.nBufferCountMin,
-             portFormat.nBufferCountActual, portFormat.nBufferSize, portFormat.nBufferAlignment);
- 
-@@ -1386,13 +1386,13 @@ bool COMXCoreComponent::Initialize( const std::string &component_name, OMX_INDEX
-     omx_err = m_DllOMX->OMX_GetHandle(&m_handle, (char*)component_name.c_str(), this, &m_callbacks);
-     if (!m_handle || omx_err != OMX_ErrorNone)
-     {
--      CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - could not get component handle for %s omx_err(0x%08x)\n", 
-+      CLog::Log(LOGERROR, "COMXCoreComponent::Initialize - could not get component handle for %s omx_err(0x%08x)\n",
-           component_name.c_str(), (int)omx_err);
-       Deinitialize(true);
-       return false;
-     }
- 
--    CLog::Log(LOGDEBUG, "COMXCoreComponent::Initialize : %s handle 0x%08x dllopen : %d\n", 
-+    CLog::Log(LOGDEBUG, "COMXCoreComponent::Initialize : %s handle %p dllopen : %d\n", 
-           m_componentName.c_str(), m_handle, m_DllOMXOpen);
-   }
- 
-@@ -1467,12 +1467,12 @@ bool COMXCoreComponent::Deinitialize(bool free_component /* = false */)
- 
-     if(free_component)
-     {
--      CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle 0x%08x dllopen : %d\n", 
-+      CLog::Log(LOGDEBUG, "COMXCoreComponent::Deinitialize : %s handle %p dllopen : %d\n", 
-           m_componentName.c_str(), m_handle, m_DllOMXOpen);
-       omx_err = m_DllOMX->OMX_FreeHandle(m_handle);
-       if (omx_err != OMX_ErrorNone)
-       {
--        CLog::Log(LOGERROR, "COMXCoreComponent::Deinitialize - failed to free handle for component %s omx_err(0x%08x)", 
-+        CLog::Log(LOGERROR, "COMXCoreComponent::Deinitialize - failed to free handle for component %s omx_err(0x%08x)",
-             m_componentName.c_str(), omx_err);
-       }  
-       m_handle = NULL;
-@@ -1705,12 +1705,12 @@ OMX_ERRORTYPE COMXCoreComponent::DecoderEventHandler(
-           CLog::Log(LOGERROR, "%s::%s %s - OMX_ErrorUnsupportedSetting, unsupported setting\n", CLASSNAME, __func__, ctx->GetName().c_str());
-         break;
-         default:
--          CLog::Log(LOGERROR, "%s::%s %s - OMX_EventError detected, nData1(0x%lx), port %d\n",  CLASSNAME, __func__, ctx->GetName().c_str(), nData1, (int)nData2);
-+          CLog::Log(LOGERROR, "%s::%s %s - OMX_EventError detected, nData1(0x%x), port %d\n",  CLASSNAME, __func__, ctx->GetName().c_str(), nData1, (int)nData2);
-         break;
-       }
-     break;
-     default:
--      CLog::Log(LOGWARNING, "%s::%s %s - Unknown eEvent(0x%x), nData1(0x%lx), port %d\n", CLASSNAME, __func__, ctx->GetName().c_str(), eEvent, nData1, (int)nData2);
-+      CLog::Log(LOGWARNING, "%s::%s %s - Unknown eEvent(0x%x), nData1(0x%x), port %d\n", CLASSNAME, __func__, ctx->GetName().c_str(), eEvent, nData1, (int)nData2);
-     break;
-   }
- 
--- 
-1.8.1.5
-
-
-From fb437ef2caa3c14b7d7d2f3c05a8702f337546e7 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 19:08:22 +0000
-Subject: [PATCH 06/11] [rbp] Use CurrentHostCounter consistently
-
----
- xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-index 178edaf..eaf176c 100644
---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-@@ -213,7 +213,7 @@ void OMXPlayerAudio::HandleSyncError(double duration)
-     m_skipdupcount = 0;
-     m_error = 0;
-     m_syncclock = false;
--    m_errortime = m_av_clock->CurrentHostCounter();
-+    m_errortime = CurrentHostCounter();
- 
-     return;
-   }
-@@ -225,12 +225,12 @@ void OMXPlayerAudio::HandleSyncError(double duration)
-     m_integral = 0;
-     m_skipdupcount = 0;
-     m_error = 0;
--    m_errortime = m_av_clock->CurrentHostCounter();
-+    m_errortime = CurrentHostCounter();
-     return;
-   }
- 
-   //check if measured error for 1 second
--  now = m_av_clock->CurrentHostCounter();
-+  now = CurrentHostCounter();
-   if ((now - m_errortime) >= m_freq)
-   {
-     m_errortime = now;
--- 
-1.8.1.5
-
-
-From 58288f6e04a13e42c64b1fdf8180709d1525c88f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 19:10:58 +0000
-Subject: [PATCH 07/11] [rbp] Use correct size when determining fifo has space
- in it
-
-This can cause player to get a decode error from audio_decode component
-closing stream when packet doesn't actually fit.
----
- xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-index eaf176c..71e015a 100644
---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-@@ -373,7 +373,7 @@ bool OMXPlayerAudio::Decode(DemuxPacket *pkt, bool bDropPacket)
-         if(m_flush)
-           break;
- 
--        if(m_omxAudio.GetSpace() < (unsigned int)pkt->iSize)
-+        if(m_omxAudio.GetSpace() < (unsigned int)decoded_size)
-         {
-           Sleep(10);
-           continue;
--- 
-1.8.1.5
-
-
-From ad492cee88cf12b5e3a2bc0ed0f894c0e2b3436d Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 19:18:13 +0000
-Subject: [PATCH 08/11] [rbp] Always acquire lock when using OMXMediaTime
-
-I don't believe the lock=false call should ever be done unless caller already has lock
----
- xbmc/cores/omxplayer/OMXPlayer.cpp      | 4 ++--
- xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 2 +-
- xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 6ec0289..66bb00f 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -3816,7 +3816,7 @@ bool COMXPlayer::GetCurrentSubtitle(CStdString& strSubtitle)
-   if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
-     return false;
- 
--  double pts = m_av_clock.OMXMediaTime(false, false);
-+  double pts = m_av_clock.OMXMediaTime(false);
- 
-   m_player_subtitle.GetCurrentSubtitle(strSubtitle, pts - m_player_video.GetSubtitleDelay());
- 
-@@ -4013,7 +4013,7 @@ void COMXPlayer::UpdatePlayState(double timeout)
- 
-     // TODO : workaround until omx clock handling is rewritten
-     if(m_playSpeed == DVD_PLAYSPEED_NORMAL)
--      state.time       = DVD_TIME_TO_MSEC(m_av_clock.OMXMediaTime(true, true));
-+      state.time       = DVD_TIME_TO_MSEC(m_av_clock.OMXMediaTime(true));
-     else
-       state.time       = DVD_TIME_TO_MSEC(state.dts + m_offset_pts);
-     state.time_total = m_pDemuxer->GetStreamLength();
-diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-index e8c9cff..ae2971e 100644
---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-@@ -351,7 +351,7 @@ void OMXPlayerVideo::Output(int iGroupId, double pts, bool bDropPacket)
-   if (!CThread::m_bStop && m_av_clock->GetAbsoluteClock(false) < m_iSleepEndTime + DVD_MSEC_TO_TIME(500))
-     return;
- 
--  double pts_media = m_av_clock->OMXMediaTime(false, false);
-+  double pts_media = m_av_clock->OMXMediaTime(false);
-   ProcessOverlays(iGroupId, pts_media);
- 
-   g_renderManager.FlipPage(CThread::m_bStop, m_iSleepEndTime / DVD_TIME_BASE, -1, FS_NONE);
--- 
-1.8.1.5
-
-
-From 14f8030d697eac3e3f104294032f078316854a87 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 19:50:41 +0000
-Subject: [PATCH 09/11] [rbp] Cosmetics
-
----
- xbmc/cores/omxplayer/OMXPlayer.cpp    | 4 ++--
- xbmc/cores/omxplayer/OMXPlayerAudio.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 66bb00f..32c902e 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -721,7 +721,7 @@ void COMXPlayer::OpenDefaultStreams(bool reset)
-   for(OMXSelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
-   {
-     if(OpenVideoStream(it->id, it->source, reset))
--      valid = true;;
-+      valid = true;
-   }
-   if(!valid)
-     CloseVideoStream(true);
-@@ -2291,7 +2291,7 @@ void COMXPlayer::HandleMessages()
-         }
- 
-         // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE
--        // audioplayer, stops outputing audio to audiorendere, but still tries to
-+        // audioplayer, stops outputing audio to audiorender, but still tries to
-         // sleep an correct amount for each packet
-         // videoplayer just plays faster after the clock speed has been increased
-         // 1. disable audio
-diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h
-index d6083e9..7a749dd 100644
---- a/xbmc/cores/omxplayer/OMXPlayerAudio.h
-+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.h
-@@ -57,7 +57,7 @@ class OMXPlayerAudio : public CThread
-   AEAudioFormat             m_format;
-   CAEChannelInfo            m_channelLayout;
-   COMXAudioCodecOMX         *m_pAudioCodec;
--  unsigned int              m_speed;
-+  int                       m_speed;
-   bool                      m_silence;
-   double                    m_audioClock;
-   double m_error;    //last average error
--- 
-1.8.1.5
-
-
-From 3a7dfb99ddd7b60d420066bb583bf1d22f90b653 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 3 Apr 2013 01:58:02 +0100
-Subject: [PATCH 10/11] [rbp] The stillframe logic doesn't work on Pi and
- causes stuttering
-
----
- xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-index ae2971e..d9326dd 100644
---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-@@ -383,21 +383,6 @@ void OMXPlayerVideo::Process()
-     }
-     else if (ret == MSGQ_TIMEOUT)
-     {
--      // if we only wanted priority messages, this isn't a stall
--      if( iPriority )
--        continue;
--
--      //Okey, start rendering at stream fps now instead, we are likely in a stillframe
--      if( !m_stalled )
--      {
--        if(m_started)
--          CLog::Log(LOGINFO, "COMXPlayerVideo - Stillframe detected, switching to forced %f fps", m_fFrameRate);
--        m_stalled = true;
--        pts += frametime*4;
--      }
--
--      pts += frametime;
--
-       continue;
-     }
- 
--- 
-1.8.1.5
-
-
-From cca2d306a43c945edc150319c132bbac49dae899 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 22 Mar 2013 20:25:43 +0000
-Subject: [PATCH 11/11] [rbp] Avoid coming out of stalled state due to
- uninitialised variable
-
-m_endtime is only initialised when we underrun. Use m_av_clock->OMXAudioBuffer() to protect access to uninitialised variable.
----
- xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-index 78e2f73..6d7bdbf 100644
---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
-@@ -510,7 +510,7 @@ void OMXPlayerAudio::Process()
-       // hard unlock audio out buffering
-       clock_gettime(CLOCK_REALTIME, &m_endtime);
-       //int iLevel = min(99,m_messageQueue.GetLevel() + MathUtils::round_int(100.0/8.0*GetCacheTime()));
--      if(/*iLevel < 10 &&*/ m_stalled && (m_endtime.tv_sec - m_starttime.tv_sec) > 1)
-+      if(/*iLevel < 10 &&*/ m_stalled && m_av_clock->OMXAudioBuffer() && (m_endtime.tv_sec - m_starttime.tv_sec) > 1)
-       {
-         m_stalled = false;
-         if(m_av_clock->HasVideo() && m_av_clock->OMXAudioBuffer())
--- 
-1.8.1.5
-
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk b/packages/mediacenter/xbmc/patches/12.1.3/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk
rename to packages/mediacenter/xbmc/patches/12.1.3/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-601-add_multithread_support_for_hi10p-0.1.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-601-add_multithread_support_for_hi10p-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-601-add_multithread_support_for_hi10p-0.1.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-601-add_multithread_support_for_hi10p-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.00-remove-windowed-display-mode.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.00-remove-windowed-display-mode.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.00-remove-windowed-display-mode.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.04-PR1934.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.04-PR1934.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.04-PR1934.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.04-PR1934.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.05-PR2193.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.05-PR2193.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.05-PR2193.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.05-PR2193.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.07-PR2449-1.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.07-PR2449-1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.07-PR2449-1.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.07-PR2449-1.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.14-PR2231.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.14-PR2231.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.14-PR2231.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.14-PR2231.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.24-PR2403-01.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.24-PR2403-01.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.24-PR2403-01.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.24-PR2403-01.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.29-airplay-handle_empty_session_ids_from_itunes.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.29-airplay-handle_empty_session_ids_from_itunes.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.29-airplay-handle_empty_session_ids_from_itunes.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.29-airplay-handle_empty_session_ids_from_itunes.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.31-airplay-refactor_the_playstate_announcement.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.31-airplay-refactor_the_playstate_announcement.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.31-airplay-refactor_the_playstate_announcement.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.31-airplay-refactor_the_playstate_announcement.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.43-omxplayer-reevaluate_HasVideoAudio_after_a_stream_change.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.43-omxplayer-reevaluate_HasVideoAudio_after_a_stream_change.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.43-omxplayer-reevaluate_HasVideoAudio_after_a_stream_change.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.43-omxplayer-reevaluate_HasVideoAudio_after_a_stream_change.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.45-PR2435.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.45-PR2435.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-990.45-PR2435.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-990.45-PR2435.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.01-xvba_support-6b6e856.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.01-xvba_support-6b6e856.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.01-xvba_support-6b6e856.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.01-xvba_support-6b6e856.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch
diff --git a/packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.10-disable-alt-tab.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/12.1.2/xbmc-995.10-disable-alt-tab.patch
rename to packages/mediacenter/xbmc/patches/12.1.3/xbmc-995.10-disable-alt-tab.patch