From afc81cc68718866b7e9f6b24a72e52cc7c47e55a Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Sat, 31 Aug 2002 18:20:50 +0000
Subject: fix mrl ending registration to cure xine-ui mrl browser segfaults

CVS patchset: 2570
CVS date: 2002/08/31 18:20:50
---
 src/demuxers/demux_fli.c    | 7 ++++++-
 src/demuxers/demux_smjpeg.c | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index b1dad2ec4..af3776da7 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.5 2002/07/15 00:54:12 tmmm Exp $
+ * $Id: demux_fli.c,v 1.6 2002/08/31 18:20:50 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -416,6 +416,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   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;
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 6ec6b507f..06b26a28d 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.8 2002/08/09 00:27:35 tmmm Exp $
+ * $Id: demux_smjpeg.c,v 1.9 2002/08/31 18:20:50 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -551,8 +551,8 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   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;
-- 
cgit v1.2.3