Commit 5aa02968 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

oggparse: fix list iteration code

Not that it really matters, but let's fix it before someone
notices and makes fun of us.
parent 03ea1bea
......@@ -572,12 +572,11 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
for (l = ogg->oggstreams; l != NULL; l = l->next) {
GstOggStream *stream = (GstOggStream *) l->data;
int j;
GList *j;
/* FIXME: list iteration */
for (j = 1; j < g_list_length (stream->headers); j++) {
gst_ogg_parse_append_header (&array,
GST_BUFFER (g_list_nth_data (stream->headers, j)));
/* already appended the first header, now do headers 2-N */
for (j = stream->headers->next; j != NULL; j = j->next) {
gst_ogg_parse_append_header (&array, GST_BUFFER (j->data));
count++;
}
}
......@@ -613,12 +612,11 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
}
for (l = ogg->oggstreams; l != NULL; l = l->next) {
GstOggStream *stream = (GstOggStream *) l->data;
int j;
GList *j;
/* FIXME: list iteration */
for (j = 1; j < g_list_length (stream->headers); j++) {
GstBuffer *buf =
GST_BUFFER (g_list_nth_data (stream->headers, j));
/* pushed the first one for each stream already, now do 2-N */
for (j = stream->headers->next; j != NULL; j = j->next) {
GstBuffer *buf = GST_BUFFER (j->data);
buf = gst_buffer_make_metadata_writable (buf);
gst_buffer_set_caps (buf, caps);
......@@ -668,13 +666,8 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
stream->stored_buffers = g_list_append (stream->stored_buffers,
pagebuffer);
} else {
if (stream->stored_buffers) {
int j;
/* FIXME: list iteration */
for (j = 0; j < g_list_length (stream->stored_buffers); j++) {
GstBuffer *buf =
GST_BUFFER (g_list_nth_data (stream->stored_buffers, j));
while (stream->stored_buffers) {
GstBuffer *buf = stream->stored_buffers->data;
buf = gst_buffer_make_metadata_writable (buf);
gst_buffer_set_caps (buf, ogg->caps);
......@@ -688,9 +681,10 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
result = gst_pad_push (ogg->srcpad, buf);
if (result != GST_FLOW_OK)
return result;
}
g_list_free (stream->stored_buffers);
stream->stored_buffers = NULL;
stream->stored_buffers =
g_list_delete_link (stream->stored_buffers,
stream->stored_buffers);
}
pagebuffer = gst_buffer_make_metadata_writable (pagebuffer);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment