jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: update to kodi-14-73b8a0f

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-11-29 13:55:18 +01:00
parent 311350443e
commit b9cf818bce
4 changed files with 2 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/kodi-theme-Confluence/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="kodi-theme-Confluence"
PKG_VERSION="14-4465fbf"
PKG_VERSION="14-73b8a0f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/kodi/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="kodi"
PKG_VERSION="14-4465fbf"
PKG_VERSION="14-73b8a0f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

37
packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch
View File

@ -1221,40 +1221,3 @@ index f9ca9ae..89a7585 100644
}
From 667a16d052988936935b49a4e8b4458a6a224eb8 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 24 Nov 2014 07:49:12 +0100
Subject: [PATCH 10/10] dvdplayer: demux ffmpeg - fix seeking behind eof
---
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 4218bfc..4147a57 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -897,6 +897,12 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
CSingleLock lock(m_critSection);
ret = av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0);
+ // demuxer will return failure, if you seek behind eof
+ if (ret < 0 && m_pFormatContext->duration && seek_pts >= (m_pFormatContext->duration + m_pFormatContext->start_time))
+ ret = 0;
+ else if (ret < 0 && m_pInput->IsEOF())
+ ret = 0;
+
if(ret >= 0)
UpdateCurrentPTS();
}
@@ -910,10 +916,6 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
if(startpts)
*startpts = DVD_MSEC_TO_TIME(time);
- // demuxer will return failure, if you seek to eof
- if (m_pInput->IsEOF() && ret <= 0)
- return true;
-
return (ret >= 0);
}

46
packages/mediacenter/kodi/patches/kodi-999.95-PR5817.patch
View File

@ -1,46 +0,0 @@
From fda83f7aa4a82b8494e0b4e4a6a254d5784b5919 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 25 Nov 2014 20:33:18 +0100
Subject: [PATCH] Revert "smb: eliminate unused while loop in OpenDir"
This reverts commit aeebd22d2e88fd14f1b0624d0bdbc6f791a75892.
---
xbmc/filesystem/SMBDirectory.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/xbmc/filesystem/SMBDirectory.cpp b/xbmc/filesystem/SMBDirectory.cpp
index 1fa00e6..026bd02 100644
--- a/xbmc/filesystem/SMBDirectory.cpp
+++ b/xbmc/filesystem/SMBDirectory.cpp
@@ -253,7 +253,7 @@ int CSMBDirectory::OpenDir(const CURL& url, std::string& strAuth)
fd = smbc_opendir(s.c_str());
}
- if (fd < 0) /* only to avoid goto in following code */
+ while (fd < 0) /* only to avoid goto in following code */
{
std::string cError;
@@ -261,15 +261,21 @@ int CSMBDirectory::OpenDir(const CURL& url, std::string& strAuth)
{
if (m_flags & DIR_FLAG_ALLOW_PROMPT)
RequireAuthentication(urlIn);
+ break;
}
- else if (errno == ENODEV || errno == ENOENT)
+
+ if (errno == ENODEV || errno == ENOENT)
cError = StringUtils::Format(g_localizeStrings.Get(770).c_str(),errno);
else
cError = strerror(errno);
if (m_flags & DIR_FLAG_ALLOW_PROMPT)
SetErrorDialog(257, cError.c_str());
+ break;
+ }
+ if (fd < 0)
+ {
// write error to logfile
CLog::Log(LOGERROR, "SMBDirectory->GetDirectory: Unable to open directory : '%s'\nunix_err:'%x' error : '%s'", CURL::GetRedacted(strAuth).c_str(), errno, strerror(errno));
}