X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d45df55eda91c16a4a47c4b4a2743dcda0c8fa7d..55125a070ce39f188225a32c664a97d8271fdcfc:/lib/python/Plugins/Extensions/MediaPlayer/plugin.py?ds=sidebyside

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 3736898e..8ef1f2fe 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -63,7 +63,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		self.addPlaylistParser(PlaylistIOInternal, "e2pls")
 
 		# 'None' is magic to start at the list of mountpoints
-		self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
+		self.filelist = FileList(None, matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|mkv)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
 		self["filelist"] = self.filelist
 
 		self.playlist = MyPlayList()
@@ -786,7 +786,7 @@ def filescan_open(list, session, **kwargs):
 	mp.savePlaylistOnExit = False
 
 	for file in list:
-		if file.mimetype.startswith("video"):
+		if file.mimetype == "video/MP2T":
 			stype = 1
 		else:
 			stype = 4097