From aa254e4374fa1753f90643d6fb1be4bdfda7efcb Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 30 Jun 2005 09:00:36 +0000 Subject: gst/avi/: Port from -THREADED to HEAD, and fix for latest API changes of the day. Keep avimux dead for now. Original commit message from CVS: * gst/avi/Makefile.am: * gst/avi/gstavi.c: (plugin_init): * gst/avi/gstavidemux.c: (gst_avi_demux_get_type), (gst_avi_demux_class_init), (gst_avi_demux_init), (gst_avi_demux_reset), (gst_avi_demux_index_next), (gst_avi_demux_index_entry_for_time), (gst_avi_demux_index_entry_for_byte), (gst_avi_demux_index_entry_for_frame), (gst_avi_demux_src_convert), (gst_avi_demux_handle_src_query), (gst_avi_demux_handle_src_event), (gst_avi_demux_parse_file_header), (gst_avi_demux_stream_init), (gst_avi_demux_parse_avih), (gst_avi_demux_parse_superindex), (gst_avi_demux_parse_subindex), (gst_avi_demux_read_subindexes), (gst_avi_demux_parse_stream), (gst_avi_demux_parse_odml), (gst_avi_demux_parse_index), (gst_avi_demux_stream_index), (gst_avi_demux_stream_scan), (gst_avi_demux_massage_index), (gst_avi_demux_stream_header), (gst_avi_demux_handle_seek), (gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data), (gst_avi_demux_loop), (gst_avi_demux_sink_activate), (gst_avi_demux_sink_activate_pull): * gst/avi/gstavidemux.h: Port from -THREADED to HEAD, and fix for latest API changes of the day. Keep avimux dead for now. --- gst/avi/gstavi.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gst/avi/gstavi.c') diff --git a/gst/avi/gstavi.c b/gst/avi/gstavi.c index 4ab32d7b..91adeb40 100644 --- a/gst/avi/gstavi.c +++ b/gst/avi/gstavi.c @@ -26,23 +26,21 @@ #include "gst/gst-i18n-plugin.h" #include "gstavidemux.h" -#include "gstavimux.h" +/*#include "gstavimux.h"*/ static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_library_load ("riff")) - return FALSE; + gst_riff_init (); #ifdef ENABLE_NLS setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); #endif /* ENABLE_NLS */ - return (gst_element_register (plugin, "avidemux", - GST_RANK_PRIMARY, - GST_TYPE_AVI_DEMUX) && - gst_element_register (plugin, "avimux", GST_RANK_NONE, GST_TYPE_AVIMUX)); + return (gst_element_register (plugin, "avidemux", GST_RANK_PRIMARY, GST_TYPE_AVI_DEMUX) /*&& + gst_element_register (plugin, "avimux", GST_RANK_NONE, GST_TYPE_AVIMUX) */ + ); } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, -- cgit