diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
index 16e59b7..f7e9e0d 100644
--- a/libeplayer3/container/container_ffmpeg.c
+++ b/libeplayer3/container/container_ffmpeg.c
@@ -1604,10 +1604,8 @@ int container_ffmpeg_init(Context_t *context, char * filename)
     }
 
     avContext->flags = AVFMT_FLAG_GENPTS;
-#ifndef MARTII // I'm currently taking the DVB subtitle info from the stream. Need to probe.
     if (context->playback->noprobe)
         avContext->max_analyze_duration = 1;
-#endif
 
     ffmpeg_printf(20, "find_streaminfo\n");
 
diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp
index 81e29fc..88257bc 100644
--- a/libspark/playback_libeplayer3.cpp
+++ b/libspark/playback_libeplayer3.cpp
@@ -106,7 +106,11 @@ void cPlayback::Close(void)
 }
 
 //Used by Fileplay
+#ifdef MARTII
+bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int, bool no_probe)
+#else
 bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int)
+#endif
 {
 	bool ret = false;
 	bool isHTTP = false;
@@ -150,7 +154,11 @@ bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned s
 	    printf("upnp://\n");
             isHTTP = true;
 	}
+#ifdef MARTII
+	else if (pm == PLAYMODE_TS && no_probe)
+#else
 	else if (pm == PLAYMODE_TS)
+#endif
 	    strcat(file, "myts://");
 	else
 	    strcat(file, "file://");
diff --git a/libspark/playback_libeplayer3.h b/libspark/playback_libeplayer3.h
index ac46b97..f8e98c0 100644
--- a/libspark/playback_libeplayer3.h
+++ b/libspark/playback_libeplayer3.h
@@ -33,7 +33,11 @@ class cPlayback
 		bool Open(playmode_t PlayMode);
 		void Close(void);
 		bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid,
+#ifdef MARTII
+			   int ac3, unsigned int duration, bool no_probe = true);
+#else
 			   int ac3, unsigned int duration);
+#endif
 		bool SetAPid(unsigned short pid, bool ac3);
 #ifdef MARTII
 		bool SetSubtitlePid(unsigned short pid);