[gst-cvs] dolphy gstreamer: gstreamer/ gstreamer/gst/

[<do...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     dolphy
Date:           Tue Aug 14 2007  13:43:58 UTC

Log message:
2007-08-14  Julien MOUTTE  <ju...@mo...>
        * gst/gstindex.c: (gst_index_add_association): Fix index entry
        generation from vargs. Fixes #466595.

Modified files:
    .               : ChangeLog
    gst             : gstindex.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3371&r2=1.3372
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstindex.c.diff?r1=1.42&r2=1.43

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3371
retrieving revision 1.3372
diff -u -d -r1.3371 -r1.3372
--- ChangeLog	14 Aug 2007 13:37:15 -0000	1.3371
+++ ChangeLog	14 Aug 2007 13:43:44 -0000	1.3372
@@ -1,3 +1,8 @@
+2007-08-14  Julien MOUTTE  <ju...@mo...>
+
+	* gst/gstindex.c: (gst_index_add_association): Fix index entry
+	generation from vargs. Fixes #466595.
 2007-08-14  Wim Taymans  <wim...@gm...>
 
 	* gst/gstbin.c: (gst_bin_element_set_state):
Index: gstindex.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstindex.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gstindex.c	7 Jun 2006 08:38:29 -0000	1.42
+++ gstindex.c	14 Aug 2007 13:43:44 -0000	1.43
@@ -736,22 +736,26 @@
   array = g_array_new (FALSE, FALSE, sizeof (GstIndexAssociation));
+  {
+    GstIndexAssociation a;
+    a.format = format;
+    a.value = value;
+    n_assocs = 1;
+    g_array_append_val (array, a);
+  }
   va_start (args, value);
-  cur_format = format;
-  n_assocs = 0;
-  while (cur_format) {
+  while ((cur_format = va_arg (args, GstFormat))) {
     GstIndexAssociation a;
+    a.format = cur_format;
+    a.value = va_arg (args, gint64);
     n_assocs++;
-    cur_format = va_arg (args, GstFormat);
-    if (cur_format) {
-      a.format = cur_format;
-      a.value = va_arg (args, gint64);
-
-      g_array_append_val (array, a);
-    }
   }
   va_end (args);
   list = (GstIndexAssociation *) g_array_free (array, FALSE);