[xine-cvs] CVS: xine-lib/src/demuxers demux_fli.c,1.5,1.6 demux_smjpeg.c,1.8,1.9

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory usw-pr-cvs1:/tmp/cvs-serv23313/src/demuxers

Modified Files:
	demux_fli.c demux_smjpeg.c 
Log Message:
fix mrl ending registration to cure xine-ui mrl browser segfaults


Index: demux_fli.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_fli.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_fli.c	15 Jul 2002 00:54:12 -0000	1.5
+++ demux_fli.c	31 Aug 2002 18:20:50 -0000	1.6
@@ -416,6 +416,11 @@
   this->config = xine->config;
   this->xine   = xine;
 
+  (void *) this->config->register_string(this->config,
+                                         "mrl.ends_fli", VALID_ENDS,
+                                         "valid mrls ending for fli demuxer",
+                                         NULL, NULL, NULL);
+
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
   this->demux_plugin.open              = demux_fli_open;
   this->demux_plugin.start             = demux_fli_start;

Index: demux_smjpeg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_smjpeg.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demux_smjpeg.c	9 Aug 2002 00:27:35 -0000	1.8
+++ demux_smjpeg.c	31 Aug 2002 18:20:50 -0000	1.9
@@ -551,8 +551,8 @@
   this->xine   = xine;
 
   (void *) this->config->register_string(this->config,
-                                         "mrl.ends_film", VALID_ENDS,
-                                         _("valid mrls ending for film demuxer"),
+                                         "mrl.ends_smjpeg", VALID_ENDS,
+                                         _("valid mrls ending for smjpeg demuxer"),
                                          NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;