diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp
index 612bd5d..d0f9ef3 100644
--- a/generic-pc/video.cpp
+++ b/generic-pc/video.cpp
@@ -211,11 +211,7 @@ void cVideo::SetVideoMode(analog_mode_t)
 {
 }
 
-#ifdef MARTII
-void cVideo::ShowPicture(const char *fname, bool)
-#else
 void cVideo::ShowPicture(const char *fname)
-#endif
 {
 	lt_info("%s(%s)\n", __func__, fname);
 	if (access(fname, R_OK))
diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h
index 861b965..ad4ea40 100644
--- a/generic-pc/video_lib.h
+++ b/generic-pc/video_lib.h
@@ -178,11 +178,7 @@ class cVideo : public OpenThreads::Thread
 		bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
 		void SetCECAutoView(bool) { return; };
 		void SetCECAutoStandby(bool) { return; };
-#ifdef MARTII
-		void ShowPicture(const char * fname, bool isM2V = false);
-#else
 		void ShowPicture(const char * fname);
-#endif
 		void StopPicture();
 		void Standby(unsigned int bOn);
 #ifdef MARTII
diff --git a/libspark/video.cpp b/libspark/video.cpp
index 53042ae..cbda5f9 100644
--- a/libspark/video.cpp
+++ b/libspark/video.cpp
@@ -370,11 +370,7 @@ void cVideo::SetVideoMode(analog_mode_t mode)
 	proc_put("/proc/stb/avs/0/colorformat", m, strlen(m));
 }
 
-#ifdef MARTII
-void cVideo::ShowPicture(const char * fname, bool isM2V)
-#else
 void cVideo::ShowPicture(const char * fname)
-#endif
 {
 	lt_debug("%s(%s)\n", __func__, fname);
 #ifndef MARTII
@@ -393,7 +389,8 @@ void cVideo::ShowPicture(const char * fname)
 		return;
 	}
 #ifdef MARTII
-    if (isM2V)
+    const char *lastDot = strrchr(fname, '.');
+    if (lastDot && !strcasecmp(lastDot + 1, "m2v"))
 	strncpy(destname, fname, sizeof(destname));
     else {
 #endif
diff --git a/libspark/video_lib.h b/libspark/video_lib.h
index 874636f..caf8026 100644
--- a/libspark/video_lib.h
+++ b/libspark/video_lib.h
@@ -174,11 +174,7 @@ class cVideo
 		bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
 		void SetCECAutoView(bool) { return; };
 		void SetCECAutoStandby(bool) { return; };
-#ifdef MARTII
-		void ShowPicture(const char * fname, bool isM2V = false);
-#else
 		void ShowPicture(const char * fname);
-#endif
 		void StopPicture();
 		void Standby(unsigned int bOn);
 #ifdef MARTII