git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into enigma2_rel25
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index 017c58f0abdaa3ed0e58256f5b51acfe15448447..9c1972d7cd5ab99fb909bfcb44b43a693b8b49b3 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-37,6
+37,7
@@
eServiceFactoryMP3::eServiceFactoryMP3()
extensions.push_back("wave");
extensions.push_back("mkv");
extensions.push_back("avi");
extensions.push_back("wave");
extensions.push_back("mkv");
extensions.push_back("avi");
+ extensions.push_back("divx");
extensions.push_back("dat");
extensions.push_back("flac");
extensions.push_back("mp4");
extensions.push_back("dat");
extensions.push_back("flac");
extensions.push_back("mp4");
@@
-207,7
+208,7
@@
eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
sourceinfo.containertype = ctMPEGTS;
else if ( strcasecmp(ext, ".mkv") == 0 )
sourceinfo.containertype = ctMKV;
sourceinfo.containertype = ctMPEGTS;
else if ( strcasecmp(ext, ".mkv") == 0 )
sourceinfo.containertype = ctMKV;
- else if ( strcasecmp(ext, ".avi") == 0 )
+ else if ( strcasecmp(ext, ".avi") == 0
|| strcasecmp(ext, ".divx") == 0
)
sourceinfo.containertype = ctAVI;
else if ( strcasecmp(ext, ".mp4") == 0 )
sourceinfo.containertype = ctMP4;
sourceinfo.containertype = ctAVI;
else if ( strcasecmp(ext, ".mp4") == 0 )
sourceinfo.containertype = ctMP4;