4 files changed, 5 insertions, 62 deletions

diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index 2afdef1ce..a8a01f7d4 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -580,20 +580,7 @@ open_plugin (demux_class_t *class_gen,
             return NULL;
         }
         break;
-        case METHOD_BY_EXTENSION: {
-            char *ending, *mrl;
-    
-            mrl = input->get_mrl (input);
-    
-            ending = strrchr (mrl, '.');
-
-            if (!ending || (strlen (ending) < 5))
-                return NULL;
-
-            if (strncasecmp (ending, ".flac", 5))
-                return NULL;
-        }
-        break;
+        case METHOD_BY_EXTENSION:
         case METHOD_EXPLICIT:
         break;
         default:
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index adf97a43d..898d00f3e 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -318,19 +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: {
-    const char *extensions, *mrl;
-
-    mrl = input->get_mrl (input);
-    extensions = class_gen->get_extensions (class_gen);
-
-    if (!_x_demux_check_extension (mrl, extensions)) {
-      free (this);
-      return NULL;
-    }
-  }
-  /* falling through is intended */
-
+  case METHOD_BY_EXTENSION:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
 
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index a8c0b4160..850a58be7 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -349,17 +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: {
-    const char *const mrl = input->get_mrl (input);
-    const char *const extensions = class_gen->get_extensions (class_gen);
-
-    if (!_x_demux_check_extension (mrl, extensions)) {
-      free (this);
-      return NULL;
-    }
-  }
-  /* Falling through is intended */
-
+  case METHOD_BY_EXTENSION:
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
     
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 393700510..f5df0401d 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -1943,18 +1943,7 @@ static int detect_ogg_content (int detection_method, demux_class_t *class_gen,
         return 0;
     }
 
-    case METHOD_BY_EXTENSION: {
-      const char *extensions, *mrl;
-
-      mrl = input->get_mrl (input);
-      extensions = class_gen->get_extensions (class_gen);
-
-      if (_x_demux_check_extension (mrl, extensions))
-        return 1;
-      else
-        return 0;
-    }
-
+    case METHOD_BY_EXTENSION:
     case METHOD_EXPLICIT:
       return 1;
 
@@ -2005,18 +1994,7 @@ static int detect_anx_content (int detection_method, demux_class_t *class_gen,
 
 #undef ANNODEX_SIGNATURE_SEARCH
 
-    case METHOD_BY_EXTENSION: {
-      const char *extensions, *mrl;
-
-      mrl = input->get_mrl (input);
-      extensions = class_gen->get_extensions (class_gen);
-
-      if (_x_demux_check_extension (mrl, extensions))
-        return 1;
-      else
-        return 0;
-    }
-
+    case METHOD_BY_EXTENSION:
     case METHOD_EXPLICIT:
       return 1;