Merge remote-tracking branch 'origin/master' into 0.11

This commit is contained in:
Edward Hervey 2011-12-29 16:49:39 +01:00
commit e136cc334f

View file

@ -1161,8 +1161,9 @@ gst_value_free_fraction_range (GValue * value)
GValue *vals = (GValue *) value->data[0].v_pointer; GValue *vals = (GValue *) value->data[0].v_pointer;
if (vals != NULL) { if (vals != NULL) {
g_value_unset (&vals[0]); /* we know the two values contain fractions without internal allocs */
g_value_unset (&vals[1]); /* g_value_unset (&vals[0]); */
/* g_value_unset (&vals[1]); */
g_slice_free1 (2 * sizeof (GValue), vals); g_slice_free1 (2 * sizeof (GValue), vals);
value->data[0].v_pointer = NULL; value->data[0].v_pointer = NULL;
} }
@ -1311,8 +1312,9 @@ gst_value_set_fraction_range_full (GValue * value,
gst_value_set_fraction (&end, numerator_end, denominator_end); gst_value_set_fraction (&end, numerator_end, denominator_end);
gst_value_set_fraction_range (value, &start, &end); gst_value_set_fraction_range (value, &start, &end);
g_value_unset (&start); /* we know the two values contain fractions without internal allocs */
g_value_unset (&end); /* g_value_unset (&start); */
/* g_value_unset (&end); */
} }
/** /**