Merge pull request #3963 from arnova/mkv_multi_cache

changed: Enable multicache for mkv files (fixes #13841)
xbmc · Jan 20, 2014 · 6546944 · 6546944
2 parents d7f3c3a + 41bb56d
commit 6546944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp b/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

diff --git a/xbmc/filesystem/File.cpp b/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);
       }
     }