diff --git a/packages/mediacenter/xbmc-master-theme-Confluence/package.mk b/packages/mediacenter/xbmc-master-theme-Confluence/package.mk index f605dda03e..9736769b21 100644 --- a/packages/mediacenter/xbmc-master-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-master-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-master-theme-Confluence" -PKG_VERSION="14-088e9fa" +PKG_VERSION="14-7bffdd1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-master/package.mk b/packages/mediacenter/xbmc-master/package.mk index 787277878a..72354787cd 100644 --- a/packages/mediacenter/xbmc-master/package.mk +++ b/packages/mediacenter/xbmc-master/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-master" -PKG_VERSION="14-088e9fa" +PKG_VERSION="14-7bffdd1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-master/patches/xbmc-master-999.80.02-PR4624.patch b/packages/mediacenter/xbmc-master/patches/xbmc-master-999.80.02-PR4624.patch deleted file mode 100644 index 2c23e9e047..0000000000 --- a/packages/mediacenter/xbmc-master/patches/xbmc-master-999.80.02-PR4624.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3fae42dcad347a3a3b6d1a2ed0ba8c0d7f172de0 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Wed, 30 Apr 2014 15:29:51 +0200 -Subject: [PATCH] paplayer: dvdplayercodec - check if seek is possible before - trying to seek - ---- - xbmc/cores/paplayer/DVDPlayerCodec.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp -index c60abc8..89e9dbe 100644 ---- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp -+++ b/xbmc/cores/paplayer/DVDPlayerCodec.cpp -@@ -202,8 +202,11 @@ bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache) - } - else - { -- m_pInputStream->Seek(0, SEEK_SET); -- m_pDemuxer->Reset(); -+ if (m_pInputStream->Seek(0, SEEK_POSSIBLE)) -+ { -+ m_pInputStream->Seek(0, SEEK_SET); -+ m_pDemuxer->Reset(); -+ } - m_bCanSeek = false; - } - --- -1.9.1 -