Merge "Treat files with extension MPEG as MP4 during scanning"

1 files changed, 2 insertions, 1 deletions

diff --git a/android/pvmediascanner.cpp b/android/pvmediascanner.cpp
index b18c5ee0a..ea5a9711e 100644
--- a/android/pvmediascanner.cpp
+++ b/android/pvmediascanner.cpp
@@ -578,7 +578,8 @@ status_t PVMediaScanner::processFile(const char *path, const char* mimeType, Med
     } else if (extension &&
         (strcasecmp(extension, ".mp4") == 0 || strcasecmp(extension, ".m4a") == 0 ||
          strcasecmp(extension, ".3gp") == 0 || strcasecmp(extension, ".3gpp") == 0 ||
-         strcasecmp(extension, ".3g2") == 0 || strcasecmp(extension, ".3gpp2") == 0)) {
+         strcasecmp(extension, ".3g2") == 0 || strcasecmp(extension, ".3gpp2") == 0 ||
+         strcasecmp(extension, ".mpeg") == 0)) {
         result = parseMP4(path, client);
     } else if (extension && strcasecmp(extension, ".ogg") == 0) {
         result = parseOgg(path, client);