diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-05-07 10:42:36 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2014-05-07 10:43:28 +1200 |
| commit | 15eb338bf2e5bd652669575194b1f9c96b9e7c47 (patch) | |
| tree | a0bfcf74bc57f2c777105159969c155de2e2a1af | |
| parent | a28b46aaaa0330ecf9566292684e34174ed4e1e5 (diff) | |
Merge pull request #4653 from FernetMenta/paplayer
paplayer: fix mp4 playback
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp | 2 | ||||
| -rw-r--r-- | xbmc/cores/paplayer/DVDPlayerCodec.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp index 122e92297c..1b0f7e8460 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; } diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp index 441bcd8023..88dad0731c 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 |