diff options
Diffstat (limited to 'src/demuxers/demux_avi.c')
| -rw-r--r-- | src/demuxers/demux_avi.c | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index cee6babee..c1edff642 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.22 2001/07/04 14:13:47 uid56437 Exp $ + * $Id: demux_avi.c,v 1.23 2001/07/14 12:50:34 guenter Exp $ * * demultiplexer for avi streams * @@ -901,7 +901,6 @@ static int demux_avi_get_status (demux_plugin_t *this_gen) { static void demux_avi_start (demux_plugin_t *this_gen, fifo_buffer_t *video_fifo, fifo_buffer_t *audio_fifo, - fifo_buffer_t *spu_fifo, off_t pos, gui_get_next_mrl_cb_t next_mrl_cb, gui_branched_cb_t branched_cb) @@ -1072,32 +1071,26 @@ static char *demux_avi_get_id(void) { demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) { - demux_avi_t *this = xmalloc (sizeof (demux_avi_t)); + demux_avi_t *this; - xine_debug = config->lookup_int (config, "xine_debug", 0); - - switch (iface) { - - case 1: - - this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; - this->demux_plugin.open = demux_avi_open; - this->demux_plugin.start = demux_avi_start; - this->demux_plugin.stop = demux_avi_stop; - this->demux_plugin.close = demux_avi_close; - this->demux_plugin.get_status = demux_avi_get_status; - this->demux_plugin.get_identifier = demux_avi_get_id; - - return (demux_plugin_t *) this; - break; - - default: - fprintf(stderr, - "Demuxer plugin doesn't support plugin API version %d.\n" - "PLUGIN DISABLED.\n" - "This means there's a version mismatch between xine and this " - "demuxer plugin.\nInstalling current input plugins should help.\n", + if (iface != 2) { + printf( "demux_mpeg: plugin doesn't support plugin API version %d.\n" + "demux_mpeg: this means there's a version mismatch between xine and this " + "demux_mpeg: demuxer plugin.\nInstalling current input plugins should help.\n", iface); return NULL; } + + this = xmalloc (sizeof (demux_avi_t)); + xine_debug = config->lookup_int (config, "xine_debug", 0); + + this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; + this->demux_plugin.open = demux_avi_open; + this->demux_plugin.start = demux_avi_start; + this->demux_plugin.stop = demux_avi_stop; + this->demux_plugin.close = demux_avi_close; + this->demux_plugin.get_status = demux_avi_get_status; + this->demux_plugin.get_identifier = demux_avi_get_id; + + return (demux_plugin_t *) this; } |