diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-01-09 10:30:59 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-01-09 10:30:59 +0000 |
| commit | 0f37f59441ff9c905eee073dd3b52d6f17a60cfb (patch) | |
| tree | 87340327b9b302c96053dfe1c29a95ec3fbc096c | |
| parent | cb8b8a6b6c29bf3f1c7a11d325dc64e5b1556e26 (diff) | |
ext/alsa/gstalsa.c: Reset variables on READY.
Original commit message from CVS:
* ext/alsa/gstalsa.c: (gst_alsa_change_state):
Reset variables on READY.
* gst/matroska/matroska-mux.c: (gst_matroska_mux_request_new_pad),
(gst_matroska_mux_loop):
Require data before writing header.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 7 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2005-01-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * ext/alsa/gstalsa.c: (gst_alsa_change_state): + Reset variables on READY. + * gst/matroska/matroska-mux.c: (gst_matroska_mux_request_new_pad), + (gst_matroska_mux_loop): + Require data before writing header. + 2005-01-09 Francis Labonte <francis_labonte@hotmail.com> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index d1267067..cdd631e7 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -645,8 +645,8 @@ gst_matroska_mux_request_new_pad (GstElement * element, pad = gst_pad_new_from_template (templ, name); g_free (name); - gst_element_add_pad (element, pad); gst_pad_set_link_function (pad, linkfunc); + gst_element_add_pad (element, pad); context->index = mux->num_streams++; mux->sink[context->index].track = context; context->pad = pad; @@ -1132,6 +1132,11 @@ gst_matroska_mux_loop (GstElement * element) GstMatroskaMux *mux = GST_MATROSKA_MUX (element); guint i; + if (gst_matroska_mux_prepare_data (mux) == -1) { + GST_ELEMENT_ERROR (element, STREAM, MUX, (NULL), ("No data")); + return; + } + /* start with a header */ if (mux->state == GST_MATROSKA_MUX_STATE_START) { if (mux->num_streams == 0) { |