Browse files

Merge pull request #3963 from arnova/mkv_multi_cache

changed: Enable multicache for mkv files (fixes #13841)
  • Loading branch information...
2 parents d7f3c3a + 41bb56d commit 654694442b371512a87c838aab4423668901e811 @arnova arnova committed Jan 20, 2014
Showing with 2 additions and 2 deletions.
  1. +1 −1 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
  2. +1 −1 xbmc/filesystem/File.cpp
View
2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
@@ -77,7 +77,7 @@ bool CDVDInputStreamFile::Open(const char* strFile, const std::string& content)
if (!(flags & READ_CACHED))
flags |= READ_NO_CACHE; // Make sure CFile honors our no-cache hint
- if (content == "video/mp4" || content == "video/x-msvideo" || content == "video/avi")
+ if (content == "video/mp4" || content == "video/x-msvideo" || content == "video/avi" || content == "video/x-matroska")
flags |= READ_MULTI_STREAM;
// open file in binary mode
View
2 xbmc/filesystem/File.cpp
@@ -296,7 +296,7 @@ bool CFile::Open(const CStdString& strFileName, const unsigned int flags)
if (m_flags & READ_CACHED)
{
// for internet stream, if it contains multiple stream, file cache need handle it specially.
- m_pFile = new CFileCache((m_flags & READ_MULTI_STREAM) != 0 && URIUtils::IsInternetStream(url, true));
+ m_pFile = new CFileCache(m_flags & READ_MULTI_STREAM);
return m_pFile->Open(url);
}
}

0 comments on commit 6546944

Please sign in to comment.