Merge remote-tracking branch 'origin/obi/master-20110412'

[enigma2.git] / lib / python / Components / Scanner.py

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 813c09f896884301254512a67ee334d126746e60..e01c61fd02c8647e6947d0ba675485d0dc28a10a 100644 (file)
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -11,6 +11,8 @@ add_type("application/x-dream-package", ".dmpkg")
 add_type("application/x-dream-image", ".nfi")
 add_type("video/MP2T", ".ts")
 add_type("video/x-dvd-iso", ".iso")
+add_type("video/x-matroska", ".mkv")
+add_type("audio/x-matroska", ".mka")
 
 def getType(file):
        (type, _) = guess_type(file)