summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_film.c
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2002-09-04 23:31:05 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2002-09-04 23:31:05 +0000
commit403f01979cef7e03b8322ddb870e3959c8de0f77 (patch)
tree0c40e03354069d59379b924ac9deeee0d17b10d8 /src/demuxers/demux_film.c
parentd1010f51a2cb07ba83d71423ab740a5a0c3d0934 (diff)
downloadxine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.gz
xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.bz2
merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-)
CVS patchset: 2606 CVS date: 2002/09/04 23:31:05
Diffstat (limited to 'src/demuxers/demux_film.c')
-rw-r--r--src/demuxers/demux_film.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 4230c04d0..412d89614 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
* For more information on the FILM file format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_film.c,v 1.21 2002/08/02 13:00:13 tmmm Exp $
+ * $Id: demux_film.c,v 1.22 2002/09/04 23:31:07 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -527,7 +527,7 @@ static int demux_film_open(demux_plugin_t *this_gen, input_plugin_t *input,
(this->config->register_string(this->config,
"mrl.ends_film", VALID_ENDS,
_("valid mrls ending for film demuxer"),
- NULL, NULL, NULL)));
+ NULL, 20, NULL, NULL)));
while((m = xine_strsep(&valid_ends, ",")) != NULL) {
while(*m == ' ' || *m == '\t') m++;
@@ -802,7 +802,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
(void *) this->config->register_string(this->config,
"mrl.ends_film", VALID_ENDS,
_("valid mrls ending for film demuxer"),
- NULL, NULL, NULL);
+ NULL, 20, NULL, NULL);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
this->demux_plugin.open = demux_film_open;