demux: rewrite probing and demuxer initialization

Get rid of the strange and messy reliance on DEMUXER_TYPE_ constants.
Instead of having two open functions for the demuxer callbacks (which
somehow are both optional, but you can also decide to implement both...),
just have one function. This function takes a parameter that tells the
demuxer how strictly it should check for the file headers. This is a
nice simplification and allows more flexibility.

Remove the file extension code. This literally did nothing (anymore).

Change demux_lavf so that we check our other builtin demuxers first
before libavformat tries to guess by file extension.

1 files changed, 0 insertions, 101 deletions

diff --git a/demux/extension.c b/demux/extension.c
deleted file mode 100644
index 30cb592b9f..0000000000
--- a/demux/extension.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-
-#include "stream/stream.h"
-#include "demux.h"
-
-/*
- * An autodetection based on the extension is not a good idea, but we don't care ;-)
- *
- * You should not add anything here where autodetection can be easily fixed except in
- * order to speed up auto-detection, in particular for formats that are often streamed.
- * In particular you should not normally add any DEMUXER_TYPE_LAVF, adding the
- * format to preferred_list in demux/demuxer_lavf.c will usually achieve
- * the same effect in a much more reliable way.
- */
-static struct {
-        const char *extension;
-        int demuxer_type;
-} extensions_table[] = {
-        { "vob", DEMUXER_TYPE_LAVF },
-        { "m2v", DEMUXER_TYPE_LAVF },
-        { "avi", DEMUXER_TYPE_LAVF },
-        { "asx", DEMUXER_TYPE_LAVF },
-        { "asf", DEMUXER_TYPE_LAVF },
-        { "wmv", DEMUXER_TYPE_LAVF },
-        { "wma", DEMUXER_TYPE_LAVF },
-        { "rm", DEMUXER_TYPE_LAVF },
-        { "rmvb", DEMUXER_TYPE_LAVF },
-        { "ra", DEMUXER_TYPE_LAVF },
-        { "y4m", DEMUXER_TYPE_LAVF },
-        { "mp3", DEMUXER_TYPE_LAVF },
-        { "wav", DEMUXER_TYPE_LAVF },
-        { "flac", DEMUXER_TYPE_LAVF },
-        { "fla", DEMUXER_TYPE_LAVF },
-        { "ogg", DEMUXER_TYPE_LAVF },
-        { "ogm", DEMUXER_TYPE_LAVF },
-//        { "pls", DEMUXER_TYPE_PLAYLIST },
-//        { "m3u", DEMUXER_TYPE_PLAYLIST },
-        { "xm", DEMUXER_TYPE_LAVF },
-        { "mod", DEMUXER_TYPE_LAVF },
-        { "s3m", DEMUXER_TYPE_LAVF },
-        { "it", DEMUXER_TYPE_LAVF },
-        { "mid", DEMUXER_TYPE_LAVF },
-        { "midi", DEMUXER_TYPE_LAVF },
-        { "nsv", DEMUXER_TYPE_LAVF },
-        { "nsa", DEMUXER_TYPE_LAVF },
-        { "mpc", DEMUXER_TYPE_LAVF },
-	{ "302", DEMUXER_TYPE_LAVF },
-        { "264", DEMUXER_TYPE_LAVF },
-        { "26l", DEMUXER_TYPE_LAVF },
-	{ "ac3", DEMUXER_TYPE_LAVF },
-        { "ape", DEMUXER_TYPE_LAVF },
-        { "apl", DEMUXER_TYPE_LAVF },
-        { "eac3",DEMUXER_TYPE_LAVF },
-        { "mac", DEMUXER_TYPE_LAVF },
-        { "str", DEMUXER_TYPE_LAVF },
-        { "cdg", DEMUXER_TYPE_LAVF },
-
-// At least the following are hacks against broken autodetection
-// that should not be there
-
-};
-
-int demuxer_type_by_filename(char* filename){
-  int i;
-  char* extension=strrchr(filename,'.');
-  mp_msg(MSGT_OPEN, MSGL_V, "Searching demuxer type for filename %s ext: %s\n",filename,extension);
-  if(extension) {
-    ++extension;
-//    mp_msg(MSGT_CPLAYER,MSGL_DBG2,"Extension: %s\n", extension );
-    // Look for the extension in the extensions table
-    for( i=0 ; i<(sizeof(extensions_table)/sizeof(extensions_table[0])) ; i++ ) {
-      if( !strcasecmp(extension, extensions_table[i].extension) ) {
-        mp_msg(MSGT_OPEN, MSGL_V, "Trying demuxer %d based on filename extension\n",extensions_table[i].demuxer_type);
-        return extensions_table[i].demuxer_type;
-      }
-    }
-  }
-  return DEMUXER_TYPE_UNKNOWN;
-}