mxf: Fix compilation and compiler errors with GLib < 2.16.0

This commit is contained in:
Sebastian Dröge 2009-03-26 20:28:30 +01:00
parent 2c51bbdfad
commit f510be57cd
2 changed files with 6 additions and 6 deletions

View file

@ -969,7 +969,7 @@ gst_mxf_mux_write_header_metadata (GstMXFMux * mux)
} }
#if !GLIB_CHECK_VERSION (2, 16, 0) #if !GLIB_CHECK_VERSION (2, 16, 0)
g_list_free (value); g_list_free (values);
#endif #endif
buffers = g_list_reverse (buffers); buffers = g_list_reverse (buffers);

View file

@ -1456,14 +1456,14 @@ mxf_primer_pack_to_buffer (const MXFPrimerPack * pack)
data += 8; data += 8;
if (pack->mappings) { if (pack->mappings) {
guint16 local_tag; guint local_tag;
MXFUL *ul; MXFUL *ul;
#if GLIB_CHECK_VERSION (2, 16, 0) #if GLIB_CHECK_VERSION (2, 16, 0)
GHashTableIter iter; GHashTableIter iter;
g_hash_table_iter_init (&iter, pack->mappings); g_hash_table_iter_init (&iter, pack->mappings);
#else #else
GList *l, *values; GList *l, *keys;
keys = g_hash_table_get_keys (pack->mappings); keys = g_hash_table_get_keys (pack->mappings);
#endif #endif
@ -1472,8 +1472,8 @@ mxf_primer_pack_to_buffer (const MXFPrimerPack * pack)
while (g_hash_table_iter_next (&iter, (gpointer) & local_tag, while (g_hash_table_iter_next (&iter, (gpointer) & local_tag,
(gpointer) & ul)) { (gpointer) & ul)) {
#else #else
for (l = keys l; l = l->next) { for (l = keys; l; l = l->next) {
local_tag = GPOINTER_TO_GUINT (l->data); local_tag = GPOINTER_TO_UINT (l->data);
ul = g_hash_table_lookup (pack->mappings, GUINT_TO_POINTER (local_tag)); ul = g_hash_table_lookup (pack->mappings, GUINT_TO_POINTER (local_tag));
#endif #endif
GST_WRITE_UINT16_BE (data, local_tag); GST_WRITE_UINT16_BE (data, local_tag);
@ -1584,7 +1584,7 @@ mxf_local_tag_insert (MXFLocalTag * tag, GHashTable ** hash_table)
g_return_val_if_fail (*hash_table != NULL, FALSE); g_return_val_if_fail (*hash_table != NULL, FALSE);
GST_DEBUG ("Adding local tag 0x%04x with UL %s and size %u", tag, GST_DEBUG ("Adding local tag with UL %s and size %u",
mxf_ul_to_string (&tag->ul, str), tag->size); mxf_ul_to_string (&tag->ul, str), tag->size);
g_hash_table_insert (*hash_table, &tag->ul, tag); g_hash_table_insert (*hash_table, &tag->ul, tag);