xbmc-master: update to xbmc-master-14-7bffdd1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-05-02 14:54:06 +02:00
parent b74d77de8a
commit 4a668d2f16
3 changed files with 2 additions and 33 deletions

View File

@ -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"

View File

@ -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"

View File

@ -1,31 +0,0 @@
From 3fae42dcad347a3a3b6d1a2ed0ba8c0d7f172de0 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
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