diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-31 18:20:50 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-31 18:20:50 +0000 |
| commit | afc81cc68718866b7e9f6b24a72e52cc7c47e55a (patch) | |
| tree | f9f8544531c37966846065f44593f0a7ceae1bd8 /src | |
| parent | a8ace67f22ee381e2195e410ec136d3d67f209fb (diff) | |
| download | xine-lib-afc81cc68718866b7e9f6b24a72e52cc7c47e55a.tar.gz xine-lib-afc81cc68718866b7e9f6b24a72e52cc7c47e55a.tar.bz2 | |
fix mrl ending registration to cure xine-ui mrl browser segfaults
CVS patchset: 2570
CVS date: 2002/08/31 18:20:50
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_fli.c | 7 | ||||
| -rw-r--r-- | 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; |