diff options
| author | Mark Nauwelaerts <manauw@skynet.be> | 2006-04-27 14:51:06 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-04-27 14:51:06 +0000 |
| commit | d1cdfa6d3c0950bf95ad25697e4a38586a4eab83 (patch) | |
| tree | 383baa172c1160cb0abe1e4a50bf10728703414d /gst/avi/gstavi.c | |
| parent | 422c6fcc0cfc274feef4696747e92fd7f8552811 (diff) | |
gst/avi/: Port AVI muxer to GStreamer-0.10 (#332031).
Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
* gst/avi/Makefile.am:
* gst/avi/gstavi.c: (plugin_init):
* gst/avi/gstavimux.c: (gst_avi_mux_get_type),
(gst_avi_mux_base_init), (gst_avi_mux_finalize),
(gst_avi_mux_class_init), (gst_avi_mux_init),
(gst_avi_mux_vidsink_set_caps), (gst_avi_mux_audsink_set_caps),
(gst_avi_mux_pad_link), (gst_avi_mux_pad_unlink),
(gst_avi_mux_request_new_pad), (gst_avi_mux_release_pad),
(gst_avi_mux_write_tag), (gst_avi_mux_riff_get_avi_header),
(gst_avi_mux_riff_get_avix_header),
(gst_avi_mux_riff_get_video_header),
(gst_avi_mux_riff_get_audio_header), (gst_avi_mux_add_index),
(gst_avi_mux_write_index), (gst_avi_mux_bigfile),
(gst_avi_mux_start_file), (gst_avi_mux_stop_file),
(gst_avi_mux_restart_file), (gst_avi_mux_handle_event),
(gst_avi_mux_fill_queue), (gst_avi_mux_send_pad_data),
(gst_avi_mux_strip_buffer), (gst_avi_mux_do_audio_buffer),
(gst_avi_mux_do_video_buffer), (gst_avi_mux_do_one_buffer),
(gst_avi_mux_loop), (gst_avi_mux_collect_pads),
(gst_avi_mux_get_property), (gst_avi_mux_set_property),
(gst_avi_mux_change_state):
* gst/avi/gstavimux.h:
Port AVI muxer to GStreamer-0.10 (#332031).
* tests/check/Makefile.am:
* tests/check/elements/avimux.c:
* tests/check/elements/.cvsignore:
Add unit test for AVI muxer.
Diffstat (limited to 'gst/avi/gstavi.c')
| -rw-r--r-- | gst/avi/gstavi.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gst/avi/gstavi.c b/gst/avi/gstavi.c index 51cfd461..abf49efa 100644 --- a/gst/avi/gstavi.c +++ b/gst/avi/gstavi.c @@ -26,7 +26,7 @@ #include "gst/gst-i18n-plugin.h" #include "gstavidemux.h" -/*#include "gstavimux.h"*/ +#include "gstavimux.h" static gboolean plugin_init (GstPlugin * plugin) @@ -38,9 +38,14 @@ plugin_init (GstPlugin * plugin) 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) */ - ); + if (!gst_element_register (plugin, "avidemux", GST_RANK_PRIMARY, + GST_TYPE_AVI_DEMUX) || + !gst_element_register (plugin, "avimux", GST_RANK_NONE, + GST_TYPE_AVI_MUX)) { + return FALSE; + } + + return TRUE; } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, |