diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-03-26 20:28:30 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-03-26 20:28:30 +0100 |
| commit | f510be57cd96c2814ee319bbd9c562709f1e49ba (patch) | |
| tree | 790eaea1f4f268e5e2e3e0e89459d0b1f4ced709 /gst | |
| parent | 2c51bbdfadcb4f80e8614f29e3728866de741a86 (diff) | |
| download | gst-plugins-bad-f510be57cd96c2814ee319bbd9c562709f1e49ba.tar.gz gst-plugins-bad-f510be57cd96c2814ee319bbd9c562709f1e49ba.tar.bz2 gst-plugins-bad-f510be57cd96c2814ee319bbd9c562709f1e49ba.zip | |
mxf: Fix compilation and compiler errors with GLib < 2.16.0
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/mxf/mxfmux.c | 2 | ||||
| -rw-r--r-- | gst/mxf/mxftypes.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c index d7658dbb..1ca6584d 100644 --- a/gst/mxf/mxfmux.c +++ b/gst/mxf/mxfmux.c @@ -969,7 +969,7 @@ gst_mxf_mux_write_header_metadata (GstMXFMux * mux) } #if !GLIB_CHECK_VERSION (2, 16, 0) - g_list_free (value); + g_list_free (values); #endif buffers = g_list_reverse (buffers); diff --git a/gst/mxf/mxftypes.c b/gst/mxf/mxftypes.c index c75abe43..b79e071e 100644 --- a/gst/mxf/mxftypes.c +++ b/gst/mxf/mxftypes.c @@ -1456,14 +1456,14 @@ mxf_primer_pack_to_buffer (const MXFPrimerPack * pack) data += 8; if (pack->mappings) { - guint16 local_tag; + guint local_tag; MXFUL *ul; #if GLIB_CHECK_VERSION (2, 16, 0) GHashTableIter iter; g_hash_table_iter_init (&iter, pack->mappings); #else - GList *l, *values; + GList *l, *keys; keys = g_hash_table_get_keys (pack->mappings); #endif @@ -1472,8 +1472,8 @@ mxf_primer_pack_to_buffer (const MXFPrimerPack * pack) while (g_hash_table_iter_next (&iter, (gpointer) & local_tag, (gpointer) & ul)) { #else - for (l = keys l; l = l->next) { - local_tag = GPOINTER_TO_GUINT (l->data); + for (l = keys; l; l = l->next) { + local_tag = GPOINTER_TO_UINT (l->data); ul = g_hash_table_lookup (pack->mappings, GUINT_TO_POINTER (local_tag)); #endif 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); - 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); g_hash_table_insert (*hash_table, &tag->ul, tag); |