Rename METHOD_BY_EXTENSION to METHOD_BY_MRL, as it's used to identify protocols too.

57 files changed, 64 insertions, 64 deletions

diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index a8a01f7d4..bee98d2a3 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -580,7 +580,7 @@ open_plugin (demux_class_t *class_gen,
             return NULL;
         }
         break;
-        case METHOD_BY_EXTENSION:
+        case METHOD_BY_MRL:
         case METHOD_EXPLICIT:
         break;
         default:
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index 898d00f3e..cce7c8983 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -318,7 +318,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 850a58be7..ac5c66a8d 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -349,7 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
   this->status = DEMUX_FINISHED;
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index f5df0401d..70cfc5846 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -1943,7 +1943,7 @@ static int detect_ogg_content (int detection_method, demux_class_t *class_gen,
         return 0;
     }
 
-    case METHOD_BY_EXTENSION:
+    case METHOD_BY_MRL:
     case METHOD_EXPLICIT:
       return 1;
 
@@ -1994,7 +1994,7 @@ static int detect_anx_content (int detection_method, demux_class_t *class_gen,
 
 #undef ANNODEX_SIGNATURE_SEARCH
 
-    case METHOD_BY_EXTENSION:
+    case METHOD_BY_MRL:
     case METHOD_EXPLICIT:
       return 1;
 
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index b666ee2cc..ee5ca42f0 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.h
@@ -40,7 +40,7 @@
 #define DEMUX_CAN_HANDLE           1
 
 #define METHOD_BY_CONTENT          1
-#define METHOD_BY_EXTENSION        2
+#define METHOD_BY_MRL              2
 #define METHOD_EXPLICIT            3
 
 typedef struct demux_class_s demux_class_t ;
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index d5cb64bfb..5ad5d5938 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -484,7 +484,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index 8fcfd2489..d329cc087 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -273,7 +273,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->status = DEMUX_FINISHED;
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     if (!open_aac_file(this)) {
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index 40aa2c763..e48416803 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -429,7 +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_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index d2ca1da90..f873f5d4f 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -349,7 +349,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 5321aaf92..b9d38ebb3 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -2031,7 +2031,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 
     break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index a99d0c325..2aa83d162 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -284,7 +284,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: /* no reliable detection */
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
 
     if (!open_aud_file(this)) {
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 466ffc290..d2e0c0412 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -2253,7 +2253,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index f11523239..3a6c7cba7 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -200,7 +200,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_BY_EXTENSION:
+  case METHOD_BY_MRL:
     if (strncasecmp (input->get_mrl (input), "cdda:", 5)) {
       free (this);
       return NULL;
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
index 060ae4c86..be552653f 100644
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -358,7 +358,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     if (!open_dts_file(this)) {
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index 7d684ec66..b0d10dc1c 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -363,7 +363,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 94b70cdc6..a40d3053e 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -217,7 +217,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   break;
 
   case METHOD_EXPLICIT:
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 0a5007188..b22dc4b0f 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -868,7 +868,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 436f048db..a7a7c5009 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -493,7 +493,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index b37145145..2da3019b2 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -316,7 +316,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index b2169beba..99c861e0d 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -854,7 +854,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->status = DEMUX_FINISHED;
 
   switch (stream->content_detection_method) {
-    case METHOD_BY_EXTENSION:
+    case METHOD_BY_MRL:
     case METHOD_BY_CONTENT:
     case METHOD_EXPLICIT:
       if (!open_flv_file(this)) {
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 61f674ccf..39b38c81d 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -486,7 +486,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index 7146f7f28..9e91684d5 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -1189,7 +1189,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-    case METHOD_BY_EXTENSION:
+    case METHOD_BY_MRL:
     case METHOD_BY_CONTENT:
     case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index 58cab54fe..4731acfe4 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -167,7 +167,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index 3f0f4b133..46c4689ad 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -690,7 +690,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 2d231b66b..e70426d0c 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -2788,7 +2788,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c
index b59160640..f7af7ec42 100644
--- a/src/demuxers/demux_mng.c
+++ b/src/demuxers/demux_mng.c
@@ -285,7 +285,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
       }
     break;
 
-    case METHOD_BY_EXTENSION:
+    case METHOD_BY_MRL:
     break;
 
     default:
diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c
index df48cc564..54dacdc8e 100644
--- a/src/demuxers/demux_mod.c
+++ b/src/demuxers/demux_mod.c
@@ -323,7 +323,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_EXPLICIT:
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   break;
 
   case METHOD_BY_CONTENT:
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index f1a2c600c..60750b550 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -335,7 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->status = DEMUX_FINISHED;
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 2d0878589..0a97b27bc 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -1191,7 +1191,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     return NULL;
   }
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
     break;
 
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 7367a8daa..2f7c48d44 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -1452,7 +1452,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION: {
+  case METHOD_BY_MRL: {
     char *ending;
 
     const char *const mrl = input->get_mrl (input);
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 72a052a20..1ec5b8365 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1726,7 +1726,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
     break;
 
   case METHOD_EXPLICIT: {
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 058dc130b..9b8033c7c 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -983,7 +983,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
   
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index cc4c89fe9..d5ffed5f8 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -607,7 +607,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c
index 7d687f578..c6df006fe 100644
--- a/src/demuxers/demux_playlist.c
+++ b/src/demuxers/demux_playlist.c
@@ -651,7 +651,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   this->demux_plugin.demux_class       = class_gen;
   
   switch (stream->content_detection_method) {
-    case METHOD_BY_EXTENSION:
+    case METHOD_BY_MRL:
       lprintf ("detect by extension\n");
       this->playlist = detect_by_extension (input);
       if (!this->playlist) {
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 16588d062..2f85387b2 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -443,7 +443,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index bc0e249c8..3f23ddce2 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -3076,7 +3076,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT: {
 
     if (!is_qt_file(this->input)) {
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 31c9a4981..0ae52b6bf 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -376,7 +376,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 3c148f7b7..761296ac4 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -1559,7 +1559,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   lprintf ("by content accepted.\n");
   break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
     break;
 
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index e7713c16c..0ce399e11 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -344,7 +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_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 7d883f4e2..95f81de9a 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -424,7 +424,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c
index 79bfcab54..445661b8f 100644
--- a/src/demuxers/demux_shn.c
+++ b/src/demuxers/demux_shn.c
@@ -193,7 +193,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->status = DEMUX_FINISHED;
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     if (!open_shn_file(this)) {
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index 14955166b..d7a17546f 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -335,7 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION: {
+  case METHOD_BY_MRL: {
     const char *const mrl = input->get_mrl (input);
 
     if(!strncmp(mrl, "slave://", 8))
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 96af0c26c..d24459f5b 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -412,7 +412,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 6459a2e19..728caf170 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -330,7 +330,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 56bfad093..ccb653ad2 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -568,7 +568,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index cb14ebf6f..5c2a124c1 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -2162,7 +2162,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   }
     break;
 
-  case METHOD_BY_EXTENSION: {
+  case METHOD_BY_MRL: {
     const char *const mrl = input->get_mrl (input);
 
     /* check extension */
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index 179fbc1c6..2a8af09bb 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -246,7 +246,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     if (!open_tta_file(this)) {
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
index 865eeb569..41475f966 100644
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -433,7 +433,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 1c15b893f..528d7972b 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -308,7 +308,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
index ade0f9b52..d99121d51 100644
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -191,7 +191,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   }
     break;
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
     break;
 
   default:
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 64fd170db..3cbbced9d 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -346,7 +346,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 77a2d3888..9cf2adefe 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -351,7 +351,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index 13ba1de5c..b3cf9dfb3 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -683,7 +683,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index 3469fdaff..54e8ebbaa 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -415,7 +415,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 93f0e80d1..301a5978e 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -176,7 +176,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
     return NULL;
     break;
 
-  case METHOD_BY_EXTENSION: {
+  case METHOD_BY_MRL: {
     const char *const mrl = input->get_mrl (input);
 
     if (strncmp (mrl, "v4l:/", 5))
diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index 0c9124786..69eb28388 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.c
@@ -1400,7 +1400,7 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_
   this->buflen = 0;
 
   switch (stream->content_detection_method) {
-  case METHOD_BY_EXTENSION:
+  case METHOD_BY_MRL:
     {
       const char *const mrl = input->get_mrl(input);
       const char *const ending = strrchr(mrl, '.');
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 4103df507..08ddc9424 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -1298,7 +1298,7 @@ static demux_plugin_t *probe_demux (xine_stream_t *stream, int method1, int meth
       xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "load_plugins: probing demux '%s'\n", node->info->id);
 
       if (node->plugin_class || _load_plugin_class(stream->xine, node, NULL)) {
-	if ( stream->content_detection_method == METHOD_BY_EXTENSION && 
+	if ( stream->content_detection_method == METHOD_BY_MRL && 
 	     ! _x_demux_check_extension(input->get_mrl(input),
 					 ((demux_class_t *)node->plugin_class)->extensions)
 	     )
@@ -1325,16 +1325,16 @@ demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *inp
   switch (stream->xine->demux_strategy) {
 
   case XINE_DEMUX_DEFAULT_STRATEGY:
-    return probe_demux (stream, METHOD_BY_CONTENT, METHOD_BY_EXTENSION, input);
+    return probe_demux (stream, METHOD_BY_CONTENT, METHOD_BY_MRL, input);
 
   case XINE_DEMUX_REVERT_STRATEGY:
-    return probe_demux (stream, METHOD_BY_EXTENSION, METHOD_BY_CONTENT, input);
+    return probe_demux (stream, METHOD_BY_MRL, METHOD_BY_CONTENT, input);
 
   case XINE_DEMUX_CONTENT_STRATEGY:
     return probe_demux (stream, METHOD_BY_CONTENT, -1, input);
 
   case XINE_DEMUX_EXTENSION_STRATEGY:
-    return probe_demux (stream, METHOD_BY_EXTENSION, -1, input);
+    return probe_demux (stream, METHOD_BY_MRL, -1, input);
 
   default:
     xprintf (stream->xine, XINE_VERBOSITY_LOG,
@@ -1364,7 +1364,7 @@ demux_plugin_t *_x_find_demux_plugin_by_name(xine_stream_t *stream, const char *
     if (strcasecmp(node->info->id, name) == 0) {
       if (node->plugin_class || _load_plugin_class(stream->xine, node, NULL)) {
 
-	if ( stream->content_detection_method == METHOD_BY_EXTENSION && 
+	if ( stream->content_detection_method == METHOD_BY_MRL && 
 	     ! _x_demux_check_extension(input->get_mrl(input),
 					 ((demux_class_t *)node->plugin_class)->extensions)
 	     )
@@ -1402,7 +1402,7 @@ demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const cha
   demux_plugin_t   *plugin = NULL;
 
   methods[0] = METHOD_BY_CONTENT;
-  methods[1] = METHOD_BY_EXTENSION;
+  methods[1] = METHOD_BY_MRL;
   methods[2] = -1;
 
   i = 0;
@@ -1428,7 +1428,7 @@ demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const cha
 		"load_plugin: probing '%s' (method %d)...\n", node->info->id, stream->content_detection_method );
 	if (node->plugin_class || _load_plugin_class(xine, node, NULL)) {
 
-	  if ( stream->content_detection_method == METHOD_BY_EXTENSION && 
+	  if ( stream->content_detection_method == METHOD_BY_MRL && 
 	       ! _x_demux_check_extension(input->get_mrl(input),
 					   ((demux_class_t *)node->plugin_class)->extensions)
 	       )