new content detection method METHOD_EXPLICIT for demuxer given in MRL

CVS patchset: 3126
CVS date: 2002/11/01 17:41:02

26 files changed, 100 insertions, 34 deletions

diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index 952b1d502..29bd0cf45 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux.h,v 1.22 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux.h,v 1.23 2002/11/01 17:41:02 mroi Exp $
  */
 
 #ifndef HAVE_DEMUX_H
@@ -41,6 +41,7 @@
 
 #define METHOD_BY_CONTENT          1
 #define METHOD_BY_EXTENSION        2
+#define METHOD_EXPLICIT            3
 
 typedef struct demux_class_s demux_class_t ;
 typedef struct demux_plugin_s demux_plugin_t;
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index 9a8ae2ad6..04dd677f3 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -19,7 +19,7 @@
  *
  * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_aiff.c,v 1.14 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_aiff.c,v 1.15 2002/11/01 17:41:03 mroi Exp $
  *
  */
 
@@ -350,6 +350,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_aiff_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 8deb0090d..9b09ceb51 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.73 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_asf.c,v 1.74 2002/11/01 17:41:04 mroi Exp $
  *
  * demultiplexer for asf streams
  *
@@ -1350,6 +1350,10 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 #endif
   }
   break;
+
+  case METHOD_EXPLICIT:
+  break;
+
   default:
     printf ("demux_asf: warning, unkown method %d\n", stream->content_detection_method);
     return NULL;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 10f762aaa..3c869d925 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_avi.c,v 1.130 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_avi.c,v 1.131 2002/11/01 17:41:04 mroi Exp $
  *
  * demultiplexer for avi streams
  *
@@ -1533,6 +1533,10 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
       free (this);
       return NULL;
     }
+  }
+
+  /* we want to fall through here */
+  case METHOD_EXPLICIT: {
 
     this->avi = AVI_init (this);
 
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index 655f51371..0e9b2314f 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_cda.c,v 1.30 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_cda.c,v 1.31 2002/11/01 17:41:06 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -208,7 +208,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     char *media;
     char *MRL = input->get_mrl(input);
     
-    media = strstr(MRL, "://");
+    media = strstr(MRL, ":/");
     if(media) {
       if(strncasecmp(MRL, "cda", 3) != 0) {
         free (this);
@@ -216,6 +216,10 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
       }
     }
   }
+  break;
+
+  case METHOD_EXPLICIT:
+  break;
 
   default:
     free (this);
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index f8b795a01..e14e491e2 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_elem.c,v 1.58 2002/10/29 01:28:41 guenter Exp $
+ * $Id: demux_elem.c,v 1.59 2002/11/01 17:41:06 mroi Exp $
  *
  * demultiplexer for elementary mpeg streams
  * 
@@ -273,7 +273,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
       return NULL;
     }
   }
+  break;
 
+  case METHOD_EXPLICIT:
   break;
 
   default:
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 4994cac8e..df4693c83 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
  * For more information on the FILM file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_film.c,v 1.41 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.42 2002/11/01 17:41:08 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -667,6 +667,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_film_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 2f06105f0..1a9c1de77 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -22,7 +22,7 @@
  * avoid while programming a FLI decoder, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_fli.c,v 1.24 2002/10/28 05:21:20 tmmm Exp $
+ * $Id: demux_fli.c,v 1.25 2002/11/01 17:41:11 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -297,6 +297,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_fli_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 58fef2806..10bb588bd 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -63,7 +63,7 @@
  *     - if any bytes exceed 63, do not shift the bytes at all before
  *       transmitting them to the video decoder
  *
- * $Id: demux_idcin.c,v 1.25 2002/11/01 03:36:24 tmmm Exp $
+ * $Id: demux_idcin.c,v 1.26 2002/11/01 17:41:13 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -472,6 +472,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_idcin_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index e8f16ad7c..6fc4b07e3 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg.c,v 1.93 2002/10/28 05:26:35 tmmm Exp $
+ * $Id: demux_mpeg.c,v 1.94 2002/11/01 17:41:13 mroi Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -1069,6 +1069,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
     break;
 
+  case METHOD_EXPLICIT:
+    break;
+
   default:
     free (this);
     return NULL;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 6507aa0fc..b3082ceba 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.134 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_mpeg_block.c,v 1.135 2002/11/01 17:41:15 mroi Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -1042,6 +1042,27 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     }
   }
   break;
+
+  case METHOD_EXPLICIT: {
+
+    this->blocksize = input->get_blocksize(input);
+#ifdef LOG
+    printf("demux_mpeg_block:open_plugin:blocksize=%d\n",this->blocksize);
+#endif
+
+    if (!this->blocksize &&
+	((input->get_capabilities(input) & INPUT_CAP_SEEKABLE) != 0))
+      this->blocksize = demux_mpeg_detect_blocksize( this, input );
+
+    if (!this->blocksize) {
+      free (this);
+      return NULL;
+    }
+
+    demux_mpeg_block_accept_input (this, input);
+  }
+  break;
+
   default:
     free (this);
     return NULL;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 3ac857d29..d9a3a1ff2 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.74 2002/11/01 01:47:51 guenter Exp $
+ * $Id: demux_mpgaudio.c,v 1.75 2002/11/01 17:41:18 mroi Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -531,7 +531,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     printf ("demux_mpgaudio: stage by extension %s\n", MRL);
 #endif
 
-    if (strncmp (MRL, "ice ://", 7)) {
+    if (strncmp (MRL, "ice:/", 5)) {
     
       suffix = strrchr(MRL, '.');
     
@@ -546,6 +546,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     }
   }
   break;
+
+  case METHOD_EXPLICIT:
+  break;
   
   default:
     return NULL;
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 4f996eb17..8c969e16b 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ogg.c,v 1.49 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_ogg.c,v 1.50 2002/11/01 17:41:20 mroi Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -974,11 +974,14 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
     if (strncasecmp(ending, ".ogg", 4) &&
         strncasecmp(ending, ".ogm", 4)) {
       return NULL;
-    }
-    
+    } 
 
   }
   break;
+
+  case METHOD_EXPLICIT:
+  break;
+
   default:
     return NULL;
   }
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 250366000..5977d7ef5 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_pes.c,v 1.40 2002/10/26 22:00:53 guenter Exp $
+ * $Id: demux_pes.c,v 1.41 2002/11/01 17:41:22 mroi Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -529,7 +529,7 @@ static int demux_pes_open(demux_plugin_t *this_gen,
 							    _("valid mrls for pes demuxer"),
 							    NULL, 20, NULL, NULL)));
     
-    media = strstr(MRL, "://");
+    media = strstr(MRL, ":/");
     if(media) {
       while((m = xine_strsep(&valid_mrls, ",")) != NULL) { 
 	
@@ -570,6 +570,9 @@ static int demux_pes_open(demux_plugin_t *this_gen,
   }
   break;
 
+  case METHOD_EXPLICIT:
+  break;
+
   default:
     return DEMUX_CANNOT_HANDLE;
     break;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 206b87ca4..3c03d24c2 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
  *    build_frame_table
  *  free_qt_info
  *
- * $Id: demux_qt.c,v 1.107 2002/10/29 00:37:26 tmmm Exp $
+ * $Id: demux_qt.c,v 1.108 2002/11/01 17:41:23 mroi Exp $
  *
  */
 
@@ -1865,6 +1865,10 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
       free (this);
       return NULL;
     }
+  }
+
+  /* we want to fall through here */
+  case METHOD_EXPLICIT: {
 
     if (!is_qt_file(this->input)) {
       free (this);
@@ -1878,9 +1882,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
       free (this);
       return NULL;
     }
-
   }
-
   break;
 
   default:
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index c6ba422a1..9d7d447b1 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -21,7 +21,7 @@
  * For more information regarding the Real file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_real.c,v 1.6 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_real.c,v 1.7 2002/11/01 17:41:25 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -410,6 +410,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_real_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index d3a4eb453..9b68412bb 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -19,7 +19,7 @@
  *
  * RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_realaudio.c,v 1.2 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_realaudio.c,v 1.3 2002/11/01 17:41:26 mroi Exp $
  *
  */
 
@@ -295,6 +295,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_ra_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 4f13473e8..9f47633a2 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -21,7 +21,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: demux_roq.c,v 1.27 2002/11/01 03:36:24 tmmm Exp $
+ * $Id: demux_roq.c,v 1.28 2002/11/01 17:41:26 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -418,6 +418,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_roq_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 66935eada..93367cf4f 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.23 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_smjpeg.c,v 1.24 2002/11/01 17:41:27 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -429,6 +429,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_smjpeg_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index c2d40500c..daf0a53b9 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -19,7 +19,7 @@
  *
  * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_snd.c,v 1.15 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_snd.c,v 1.16 2002/11/01 17:41:27 mroi Exp $
  *
  */
 
@@ -333,6 +333,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_snd_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index c6f316adc..d43252db9 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ts.c,v 1.58 2002/10/26 22:00:54 guenter Exp $
+ * $Id: demux_ts.c,v 1.59 2002/11/01 17:41:28 mroi Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -1469,7 +1469,7 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input,
 						NULL, 20, NULL, NULL)));
     
     mrl = input->get_mrl(input);
-    media = strstr(mrl, "://");
+    media = strstr(mrl, ":/");
 
     if (media) {
       LOG_MSG_STDERR (this->xine, _("demux %u ts_open!\n"), __LINE__);
@@ -1512,6 +1512,8 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input,
       }
     }
     return DEMUX_CANNOT_HANDLE;
+
+  case METHOD_EXPLICIT:
     break;
 
   default:
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index fb43ac00e..36d902ce3 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -23,7 +23,7 @@
  * It will only play that block if it is PCM data. More variations will be
  * supported as they are encountered.
  *
- * $Id: demux_voc.c,v 1.15 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_voc.c,v 1.16 2002/11/01 17:41:28 mroi Exp $
  *
  */
 
@@ -326,6 +326,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_voc_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index c7b3cf761..cb017068b 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -27,7 +27,7 @@
  * block needs information from the previous audio block in order to be
  * decoded, thus making random seeking difficult.
  *
- * $Id: demux_vqa.c,v 1.16 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_vqa.c,v 1.17 2002/11/01 17:41:28 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -380,6 +380,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_vqa_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 07f2ef6ec..e6369f94a 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -20,7 +20,7 @@
  * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net)
  * based on WAV specs that are available far and wide
  *
- * $Id: demux_wav.c,v 1.23 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_wav.c,v 1.24 2002/11/01 17:41:28 mroi Exp $
  *
  */
 
@@ -325,6 +325,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_wav_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index 7d3f070c1..3b17db78c 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -22,7 +22,7 @@
  * For more information on the MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_wc3movie.c,v 1.23 2002/11/01 03:36:24 tmmm Exp $
+ * $Id: demux_wc3movie.c,v 1.24 2002/11/01 17:41:28 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -684,6 +684,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_mve_file(this)) {
       free (this);
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index e89470739..09f0c01d4 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -22,7 +22,7 @@
  * tools, visit:
  *   http://mjpeg.sourceforge.net/
  *
- * $Id: demux_yuv4mpeg2.c,v 1.8 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: demux_yuv4mpeg2.c,v 1.9 2002/11/01 17:41:29 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -344,6 +344,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
+  case METHOD_EXPLICIT:
 
     if (!open_yuv4mpeg2_file(this)) {
       free (this);