Merge branch 'master' into 2.7

3 files changed, 4 insertions, 2 deletions

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 222512ea..841a2fe5 100755
--- 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",
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index a2422be7..036bbbb9 100755
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -110,7 +110,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 
 		# 'None' is magic to start at the list of mountpoints
 		defaultDir = config.mediaplayer.defaultDir.getValue()
-		self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
+		self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
 		self["filelist"] = self.filelist
 
 		self.playlist = MyPlayList()
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index c7bb5d99..615329c9 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2576,7 +2576,7 @@ void eDVBServicePlay::cutlistToCuesheet()
 	{
 		if (i == m_cue_entries.end())
 		{
-			if (!have_any_span)
+			if (!have_any_span && !in)
 				break;
 			out = length;
 		} else {
@@ -2606,6 +2606,7 @@ void eDVBServicePlay::cutlistToCuesheet()
 		{
 			have_any_span = 1;
 			m_cue->addSourceSpan(in, out);
+			in = out = 0;
 		}
 		
 		in = length;