1 files changed, 18 insertions, 4 deletions

diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index b324133940..f130760ff2 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -1512,14 +1512,28 @@ static void osd_seek(int btn)
     stream_seek(time, SEEK_SET);
 }
 
-/* has this file the extension .mpg ? */
+/* Has this file one of the supported extensions? */
 static bool is_videofile(const char* file)
 {
+    static const char * const extensions[] =
+    {
+        /* Should match apps/plugins/viewers.config */
+        "mpg", "mpeg", "mpv", "m2v"
+    };
+
     const char* ext = rb->strrchr(file, '.');
-    if (ext && !rb->strcasecmp(ext, ".mpg"))
-        return true;
+    int i;
 
-    return false;
+    if (!ext)
+        return false;
+
+    for (i = ARRAYLEN(extensions) - 1; i >= 0; i--)
+    {
+        if (!rb->strcasecmp(ext + 1, extensions[i]))
+            break;
+    }
+
+    return i >= 0;
 }
 
 /* deliver the next/previous video file in the current directory.