xbmc: add PR4653

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-05-05 18:07:26 +02:00
parent f47827c6f3
commit 8e95cceb42

View File

@ -0,0 +1,51 @@
From d740a5255f983085da6bc6f3747208e2da52c2a2 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 5 May 2014 15:17:19 +0200
Subject: [PATCH 1/2] dvdplayer input stream: fix incorrectly set of EOF
---
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
index 122e922..1b0f7e8 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
@@ -91,7 +91,7 @@ bool CDVDInputStreamFile::Open(const char* strFile, const std::string& content)
if (m_pFile->GetImplemenation() && (content.empty() || content == "application/octet-stream"))
m_content = m_pFile->GetImplemenation()->GetContent();
- m_eof = true;
+ m_eof = false;
return true;
}
--
1.9.1
From ae3325332355c2d015c8e268f07f0edd7f06bc20 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 5 May 2014 15:18:02 +0200
Subject: [PATCH 2/2] paplayer: fix playing some mp4 files
---
xbmc/cores/paplayer/DVDPlayerCodec.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
index b960e3b..5a13093 100644
--- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp
+++ b/xbmc/cores/paplayer/DVDPlayerCodec.cpp
@@ -197,8 +197,6 @@ bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache)
m_bCanSeek = false;
if (m_pInputStream->Seek(0, SEEK_POSSIBLE))
{
- // reset eof flag of stream, with eof set seek returns always success
- m_pInputStream->Seek(0, SEEK_SET);
if (Seek(1) != DVD_NOPTS_VALUE)
{
// rewind stream to beginning
--
1.9.1