mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/alsa/gstalsa.c: Reset variables on READY.

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2005-01-09 10:30:59 +00:00
parent cb8b8a6b6c
commit 0f37f59441
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2005-01-09 Francis Labonte <francis_labonte@hotmail.com>
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>

7
gst/matroska/matroska-mux.c
View file

@ -645,8 +645,8 @@ gst_matroska_mux_request_new_pad (GstElement * element,
pad = gst_pad_new_from_template (templ, name); pad = gst_pad_new_from_template (templ, name);
g_free (name); g_free (name);
gst_element_add_pad (element, pad);
gst_pad_set_link_function (pad, linkfunc); gst_pad_set_link_function (pad, linkfunc);
gst_element_add_pad (element, pad);
context->index = mux->num_streams++; context->index = mux->num_streams++;
mux->sink[context->index].track = context; mux->sink[context->index].track = context;
context->pad = pad; context->pad = pad;
@ -1132,6 +1132,11 @@ gst_matroska_mux_loop (GstElement * element)
GstMatroskaMux *mux = GST_MATROSKA_MUX (element); GstMatroskaMux *mux = GST_MATROSKA_MUX (element);
guint i; guint i;
if (gst_matroska_mux_prepare_data (mux) == -1) {
GST_ELEMENT_ERROR (element, STREAM, MUX, (NULL), ("No data"));
return;
}
/* start with a header */ /* start with a header */
if (mux->state == GST_MATROSKA_MUX_STATE_START) { if (mux->state == GST_MATROSKA_MUX_STATE_START) {
if (mux->num_streams == 0) { if (mux->num_streams == 0) {