diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-10-09 09:26:58 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-10-09 09:26:58 +0000 |
| commit | 0b42844a3c1c86513458eea3df625a739b128c42 (patch) | |
| tree | af989c2fe4450cc88317689378e77736916b2c93 /gst/flv/gstflvdemux.c | |
| parent | 815d2620ace9b289bebd163cfe84727836432f11 (diff) | |
| download | gst-plugins-bad-0b42844a3c1c86513458eea3df625a739b128c42.tar.gz gst-plugins-bad-0b42844a3c1c86513458eea3df625a739b128c42.tar.bz2 gst-plugins-bad-0b42844a3c1c86513458eea3df625a739b128c42.zip | |
gst/flv/: Add first version of a FLV muxer. The only missing feature is writing of stream metadata.
Original commit message from CVS:
* gst/flv/Makefile.am:
* gst/flv/gstflvdemux.c: (plugin_init):
* gst/flv/gstflvmux.c: (gst_flv_mux_base_init),
(gst_flv_mux_class_init), (gst_flv_mux_init),
(gst_flv_mux_finalize), (gst_flv_mux_reset),
(gst_flv_mux_handle_src_event), (gst_flv_mux_handle_sink_event),
(gst_flv_mux_video_pad_setcaps), (gst_flv_mux_audio_pad_setcaps),
(gst_flv_mux_request_new_pad), (gst_flv_mux_release_pad),
(gst_flv_mux_write_header), (gst_flv_mux_write_buffer),
(gst_flv_mux_collected), (gst_flv_mux_change_state):
* gst/flv/gstflvmux.h:
Add first version of a FLV muxer. The only missing feature is writing
of stream metadata.
Diffstat (limited to 'gst/flv/gstflvdemux.c')
| -rw-r--r-- | gst/flv/gstflvdemux.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 0f5e3f79..896d8bf1 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -23,6 +23,7 @@ #include "gstflvdemux.h" #include "gstflvparse.h" +#include "gstflvmux.h" #include <string.h> @@ -1207,12 +1208,14 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (flvdemux_debug, "flvdemux", 0, "FLV demuxer"); if (!gst_element_register (plugin, "flvdemux", GST_RANK_PRIMARY, - gst_flv_demux_get_type ())) + gst_flv_demux_get_type ()) || + !gst_element_register (plugin, "flvmux", GST_RANK_NONE, + gst_flv_mux_get_type ())) return FALSE; return TRUE; } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "flvdemux", "Element demuxing FLV stream", + "flv", "FLV muxing and demuxing plugin", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) |