ext/ogg/gstoggmux.c (gst_ogg_mux_set_header_on_caps): ext/ogg/gstoggparse.c (gst_ogg_...

Original commit message from CVS:
2005-11-21  Andy Wingo  <wingo@pobox.com>

patch by: Alessandro Dessina <alessandro nnva org>

* ext/ogg/gstoggmux.c (gst_ogg_mux_set_header_on_caps):
* ext/ogg/gstoggparse.c (gst_ogg_parse_append_header)
(gst_ogg_parse_chain):
* ext/theora/theoraenc.c (theora_set_header_on_caps):
* ext/vorbis/vorbisenc.c (gst_vorbisenc_set_header_on_caps):
* ext/vorbis/vorbisparse.c (vorbis_parse_set_header_on_caps): Fix
gst_value_list calls on arrays. Fixes #321962.

diff --git a/ChangeLog b/ChangeLog
index e02bafab5d464ce72c2ae8d02d9e1200a02fca47..5029977502bdb02fa30f9da0d7c7186b0bff995c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-21  Andy Wingo  <wingo@pobox.com>
+
+       patch by: Alessandro Dessina <alessandro nnva org>
+
+       * ext/ogg/gstoggmux.c (gst_ogg_mux_set_header_on_caps):
+       * ext/ogg/gstoggparse.c (gst_ogg_parse_append_header)
+       (gst_ogg_parse_chain):
+       * ext/theora/theoraenc.c (theora_set_header_on_caps):
+       * ext/vorbis/vorbisenc.c (gst_vorbisenc_set_header_on_caps):
+       * ext/vorbis/vorbisparse.c (vorbis_parse_set_header_on_caps): Fix
+       gst_value_list calls on arrays. Fixes #321962.
+
 2005-11-21  Tim-Philipp Müller  <tim at centricular dot net>
 
        * ext/ogg/gstoggmux.c: (gst_ogg_mux_init),

diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index b930dd1db4ebc42d6dc67bfab6d4ae04632b7ff5..d6fd6bb44d0294e8681b692668f022608f50e834 100644 (file)
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -768,7 +768,7 @@ static GstCaps *
 gst_ogg_mux_set_header_on_caps (GstCaps * caps, GList * buffers)
 {
   GstStructure *structure;
-  GValue list = { 0 };
+  GValue array = { 0 };
   GList *walk = buffers;
 
   caps = gst_caps_make_writable (caps);
@@ -776,7 +776,7 @@ gst_ogg_mux_set_header_on_caps (GstCaps * caps, GList * buffers)
   structure = gst_caps_get_structure (caps, 0);
 
   /* put buffers in a fixed list */
-  g_value_init (&list, GST_TYPE_ARRAY);
+  g_value_init (&array, GST_TYPE_ARRAY);
 
   while (walk) {
     GstBuffer *buf = GST_BUFFER (walk->data);
@@ -790,11 +790,11 @@ gst_ogg_mux_set_header_on_caps (GstCaps * caps, GList * buffers)
 
     g_value_init (&value, GST_TYPE_BUFFER);
     gst_value_set_buffer (&value, buf);
-    gst_value_list_append_value (&list, &value);
+    gst_value_array_append_value (&array, &value);
     g_value_unset (&value);
   }
-  gst_structure_set_value (structure, "streamheader", &list);
-  g_value_unset (&list);
+  gst_structure_set_value (structure, "streamheader", &array);
+  g_value_unset (&array);
 
   return caps;
 }

diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c
index 11edb332b44e6542c021c29515a5793358811807..38a51f09985dbf3e0a78ea0f08090557efe11155 100644 (file)
--- a/ext/ogg/gstoggparse.c
+++ b/ext/ogg/gstoggparse.c
@@ -298,7 +298,7 @@ gst_ogg_parse_submit_buffer (GstOggParse * ogg, GstBuffer * buffer)
 }
 
 static void
-gst_ogg_parse_append_header (GValue * list, GstBuffer * buf)
+gst_ogg_parse_append_header (GValue * array, GstBuffer * buf)
 {
   GValue value = { 0 };
 
@@ -306,7 +306,7 @@ gst_ogg_parse_append_header (GValue * list, GstBuffer * buf)
 
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf);
-  gst_value_list_append_value (list, &value);
+  gst_value_array_append_value (array, &value);
   g_value_unset (&value);
 
 }
@@ -501,11 +501,11 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
              */
             GstCaps *caps;
             GstStructure *structure;
-            GValue list = { 0 };
+            GValue array = { 0 };
             gint i, count = 0;
             gboolean found_pending_headers = FALSE;
 
-            g_value_init (&list, GST_TYPE_ARRAY);
+            g_value_init (&array, GST_TYPE_ARRAY);
 
             for (i = 0; i < g_slist_length (ogg->oggstreams); i++) {
               GstOggStream *stream = g_slist_nth_data (ogg->oggstreams, i);
@@ -516,7 +516,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
                 goto failure;
               }
 
-              gst_ogg_parse_append_header (&list,
+              gst_ogg_parse_append_header (&array,
                   GST_BUFFER (stream->headers->data));
               count++;
             }
@@ -526,7 +526,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
               int j;
 
               for (j = 1; j < g_slist_length (stream->headers); j++) {
-                gst_ogg_parse_append_header (&list,
+                gst_ogg_parse_append_header (&array,
                     GST_BUFFER (g_slist_nth_data (stream->headers, j)));
                 count++;
               }
@@ -536,11 +536,11 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
             caps = gst_caps_make_writable (caps);
 
             structure = gst_caps_get_structure (caps, 0);
-            gst_structure_set_value (structure, "streamheader", &list);
+            gst_structure_set_value (structure, "streamheader", &array);
 
             gst_pad_set_caps (ogg->srcpad, caps);
 
-            g_value_unset (&list);
+            g_value_unset (&array);
 
 //            gst_caps_free(caps);
 

diff --git a/ext/theora/theoraenc.c b/ext/theora/theoraenc.c
index dee6e8777984405649028a202ad98c2a1001ea5c..66fe21a6a9f2ef518a8ddfbab8c4d8344061acfd 100644 (file)
--- a/ext/theora/theoraenc.c
+++ b/ext/theora/theoraenc.c
@@ -381,7 +381,7 @@ theora_set_header_on_caps (GstCaps * caps, GstBuffer * buf1,
     GstBuffer * buf2, GstBuffer * buf3)
 {
   GstStructure *structure;
-  GValue list = { 0 };
+  GValue array = { 0 };
   GValue value = { 0 };
 
   caps = gst_caps_make_writable (caps);
@@ -393,21 +393,21 @@ theora_set_header_on_caps (GstCaps * caps, GstBuffer * buf1,
   GST_BUFFER_FLAG_SET (buf3, GST_BUFFER_FLAG_IN_CAPS);
 
   /* put buffers in a fixed list */
-  g_value_init (&list, GST_TYPE_ARRAY);
+  g_value_init (&array, GST_TYPE_ARRAY);
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf1);
-  gst_value_list_append_value (&list, &value);
+  gst_value_array_append_value (&array, &value);
   g_value_unset (&value);
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf2);
-  gst_value_list_append_value (&list, &value);
+  gst_value_array_append_value (&array, &value);
   g_value_unset (&value);
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf3);
-  gst_value_list_append_value (&list, &value);
-  gst_structure_set_value (structure, "streamheader", &list);
+  gst_value_array_append_value (&array, &value);
+  gst_structure_set_value (structure, "streamheader", &array);
   g_value_unset (&value);
-  g_value_unset (&list);
+  g_value_unset (&array);
 
   return caps;
 }

diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c
index 993fddcdaebcce1d85bf3e04dc7c179b46f2c1e9..603ee46e0fb2a4d2af93b11c72730e9d6acd15f9 100644 (file)
--- a/ext/vorbis/vorbisenc.c
+++ b/ext/vorbis/vorbisenc.c
@@ -845,7 +845,7 @@ gst_vorbisenc_set_header_on_caps (GstCaps * caps, GstBuffer * buf1,
     GstBuffer * buf2, GstBuffer * buf3)
 {
   GstStructure *structure;
-  GValue list = { 0 };
+  GValue array = { 0 };
   GValue value = { 0 };
 
   caps = gst_caps_make_writable (caps);
@@ -857,21 +857,21 @@ gst_vorbisenc_set_header_on_caps (GstCaps * caps, GstBuffer * buf1,
   GST_BUFFER_FLAG_SET (buf3, GST_BUFFER_FLAG_IN_CAPS);
 
   /* put buffers in a fixed list */
-  g_value_init (&list, GST_TYPE_ARRAY);
+  g_value_init (&array, GST_TYPE_ARRAY);
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf1);
-  gst_value_list_append_value (&list, &value);
+  gst_value_array_append_value (&array, &value);
   g_value_unset (&value);
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf2);
-  gst_value_list_append_value (&list, &value);
+  gst_value_array_append_value (&array, &value);
   g_value_unset (&value);
   g_value_init (&value, GST_TYPE_BUFFER);
   gst_value_set_buffer (&value, buf3);
-  gst_value_list_append_value (&list, &value);
-  gst_structure_set_value (structure, "streamheader", &list);
+  gst_value_array_append_value (&array, &value);
+  gst_structure_set_value (structure, "streamheader", &array);
   g_value_unset (&value);
-  g_value_unset (&list);
+  g_value_unset (&array);
 
   return caps;
 }

diff --git a/ext/vorbis/vorbisparse.c b/ext/vorbis/vorbisparse.c
index ca15c76ccf101fc001f47a7cc1deb4e14013393e..1d30a05d29e7cedb41ec449c54fb313beb8ffd62 100644 (file)
--- a/ext/vorbis/vorbisparse.c
+++ b/ext/vorbis/vorbisparse.c
@@ -104,7 +104,7 @@ vorbis_parse_set_header_on_caps (GstVorbisParse * parse, GstCaps * caps)
 {
   GstBuffer *buf1, *buf2, *buf3;
   GstStructure *structure;
-  GValue list = { 0 };
+  GValue array = { 0 };
   GValue value = { 0 };
 
   g_assert (parse);
@@ -126,21 +126,21 @@ vorbis_parse_set_header_on_caps (GstVorbisParse * parse, GstCaps * caps)
   GST_BUFFER_FLAG_SET (buf3, GST_BUFFER_FLAG_IN_CAPS);
 
   /* put buffers in a fixed list */
-  g_value_init (&list, GST_TYPE_ARRAY);
+  g_value_init (&array, GST_TYPE_ARRAY);
   g_value_init (&value, GST_TYPE_BUFFER);
   g_value_set_boxed (&value, buf1);
-  gst_value_list_append_value (&list, &value);
+  gst_value_array_append_value (&array, &value);
   g_value_unset (&value);
   g_value_init (&value, GST_TYPE_BUFFER);
   g_value_set_boxed (&value, buf2);
-  gst_value_list_append_value (&list, &value);
+  gst_value_array_append_value (&array, &value);
   g_value_unset (&value);
   g_value_init (&value, GST_TYPE_BUFFER);
   g_value_set_boxed (&value, buf3);
-  gst_value_list_append_value (&list, &value);
-  gst_structure_set_value (structure, "streamheader", &list);
+  gst_value_array_append_value (&array, &value);
+  gst_structure_set_value (structure, "streamheader", &array);
   g_value_unset (&value);
-  g_value_unset (&list);
+  g_value_unset (&array);
 }
 
 static GstFlowReturn