diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-04 16:41:12 +0100 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-04 16:41:12 +0100 |
| commit | 5ded85314f4d8b221b885a443dc797632a2101cd (patch) | |
| tree | 81b9ee9b012236783b842b6fc4390f15154bf508 /lib/service/servicemp3.cpp | |
| parent | e6a3b9fdb8f5ac0774a27794b175d79cf0973976 (diff) | |
| parent | aaeba87c8ee1b528dc9660dab9c6980155e878d4 (diff) | |
| download | enigma2-5ded85314f4d8b221b885a443dc797632a2101cd.tar.gz enigma2-5ded85314f4d8b221b885a443dc797632a2101cd.zip | |
Merge branch 'master' into experimental
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Diffstat (limited to 'lib/service/servicemp3.cpp')
| -rw-r--r-- | lib/service/servicemp3.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 62755ad5..c95609a3 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -37,6 +37,7 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("vob"); extensions.push_back("wav"); extensions.push_back("wave"); + extensions.push_back("m4v"); extensions.push_back("mkv"); extensions.push_back("avi"); extensions.push_back("divx"); @@ -241,7 +242,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref) sourceinfo.containertype = ctAVI; sourceinfo.is_video = TRUE; } - else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0) + else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0 || strcasecmp(ext, ".m4v") == 0) { sourceinfo.containertype = ctMP4; sourceinfo.is_video = TRUE; |