Merge branch 'master' into experimental

[vuplus_dvbapp] / lib / python / Components / FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index a0f66bd..b187ee3 100755 (executable)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -23,6 +23,7 @@ EXTENSIONS = {
                "ts": "movie",
                "avi": "movie",
                "divx": "movie",
+               "m4v": "movie",
                "mpg": "movie",
                "mpeg": "movie",
                "mkv": "movie",