bring back all the demuxers

CVS patchset: 2650
CVS date: 2002/09/10 15:07:13

1 files changed, 11 insertions, 10 deletions

diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index e16da55fd..c80e36f11 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.9 2002/09/05 22:18:51 mroi Exp $
+ * $Id: demux_fli.c,v 1.10 2002/09/10 15:07:14 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -401,17 +401,9 @@ static char *demux_fli_get_mimetypes(void) {
   return NULL;
 }
 
-static void *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(xine_t *xine, void *data) {
   demux_fli_t *this;
 
-  if (iface != 10) {
-    printf ("demux_fli: plugin doesn't support plugin API version %d.\n"
-            "           this means there's a version mismatch between xine and this "
-            "           demuxer plugin. Installing current demux plugins should help.\n",
-            iface);
-    return NULL;
-  }
-
   this         = (demux_fli_t *) xine_xmalloc(sizeof(demux_fli_t));
   this->config = xine->config;
   this->xine   = xine;
@@ -434,3 +426,12 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) {
   return &this->demux_plugin;
 }
 
+/*
+ * exported plugin catalog entry
+ */
+
+plugin_info_t xine_plugin_info[] = {
+  /* type, API, "name", version, special_info, init_function */  
+  { PLUGIN_DEMUX, 10, "fli", XINE_VERSION_CODE, NULL, init_demuxer_plugin },
+  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+};