git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WirelessLan/plugin.py: fix merge conflict
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index f74bc5ee66aa463b2ad0c3f1126eac1ff6cd2d36..d3eaa262874ec7cf6144e9c3ef82a66b49b88875 100644
(file)
--- 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("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");
extensions.push_back("mkv");
extensions.push_back("avi");
extensions.push_back("divx");
@@
-240,7
+241,7
@@
eServiceMP3::eServiceMP3(eServiceReference ref)
sourceinfo.containertype = ctAVI;
sourceinfo.is_video = TRUE;
}
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;
{
sourceinfo.containertype = ctMP4;
sourceinfo.is_video = TRUE;