summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_qt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_qt.c')
-rw-r--r--src/demuxers/demux_qt.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 874becd3d..fe8922ae5 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
* build_frame_table
* free_qt_info
*
- * $Id: demux_qt.c,v 1.80 2002/08/02 13:00:12 tmmm Exp $
+ * $Id: demux_qt.c,v 1.81 2002/09/04 23:31:08 guenter Exp $
*
*/
@@ -1445,7 +1445,7 @@ static int demux_qt_open(demux_plugin_t *this_gen,
xine_strdupa(valid_ends, (this->config->register_string(this->config,
"mrl.ends_qt", VALID_ENDS,
_("valid mrls ending for qt demuxer"),
- NULL, NULL, NULL)));
+ NULL, 20, NULL, NULL)));
while((m = xine_strsep(&valid_ends, ",")) != NULL) {
while(*m == ' ' || *m == '\t') m++;
@@ -1750,18 +1750,10 @@ static int demux_qt_get_stream_length (demux_plugin_t *this_gen) {
return this->qt->duration / this->qt->time_scale;
}
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin (xine_t *xine, void *data) {
demux_qt_t *this;
- if (iface != 10) {
- printf (_("demux_qt: plugin doesn't support plugin API version %d.\n"
- " this means there's a version mismatch between xine and this "
- " demuxer plugin.\nInstalling current demux plugins should help.\n"),
- iface);
- return NULL;
- }
-
this = xine_xmalloc (sizeof (demux_qt_t));
this->config = xine->config;
this->xine = xine;
@@ -1769,7 +1761,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
(void*) this->config->register_string(this->config,
"mrl.ends_qt", VALID_ENDS,
_("valid mrls ending for qt demuxer"),
- NULL, NULL, NULL);
+ NULL, 20, NULL, NULL);
this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
this->demux_plugin.open = demux_qt_open;
@@ -1785,5 +1777,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
this->status = DEMUX_FINISHED;
pthread_mutex_init( &this->mutex, NULL );
- return (demux_plugin_t *) this;
+ return this;
}
+
+/*
+ * exported plugin catalog entry
+ */
+
+plugin_info_t xine_plugin_info[] = {
+ /* type, API, "name", version, special_info, init_function */
+ { PLUGIN_DEMUX, 10, "mov", XINE_VERSION_CODE, NULL, init_demuxer_plugin },
+ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+};