diff options
Diffstat (limited to 'src/demuxers/demux_avi.c')
| -rw-r--r-- | src/demuxers/demux_avi.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 8175b9c1e..4e0ff1acc 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_avi.c,v 1.107 2002/08/19 18:26:34 mroi Exp $ + * $Id: demux_avi.c,v 1.108 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for avi streams * @@ -1534,7 +1534,7 @@ static int demux_avi_open(demux_plugin_t *this_gen, this->config->register_string(this->config, "mrl.ends_avi", VALID_ENDS, _("valid mrls ending for avi demuxer"), - NULL, NULL, NULL)); + NULL, 20, NULL, NULL)); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1591,19 +1591,10 @@ static int demux_avi_get_stream_length (demux_plugin_t *this_gen) { return 0; } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin(xine_t *xine, void *data) { demux_avi_t *this; - if (iface != 10) { - xine_log (xine, XINE_LOG_PLUGIN, - _("demux_avi: this plugin doesn't support plugin API version %d.\n" - "demux_avi: this means there's a version mismatch between xine and this " - "demux_avi: demuxer plugin.\nInstalling current demuxer plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_avi_t)); this->config = xine->config; this->xine = xine; @@ -1611,7 +1602,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_avi", VALID_ENDS, _("valid mrls ending for avi demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_avi_open; @@ -1627,5 +1618,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, "avi", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; |