[gst-cvs] gst-plugins-bad: mxf: Fix compilation and compiler errors with GLib < 2.16.

[Sebastian Dröge]

Module: gst-plugins-bad
Branch: master
Commit: f510be57cd96c2814ee319bbd9c562709f1e49ba
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=f510be57cd96c2814ee319bbd9c562709f1e49ba

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Mar 26 20:28:30 2009 +0100

mxf: Fix compilation and compiler errors with GLib < 2.16.0

---

 gst/mxf/mxfmux.c   |    2 +-
 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 d7658db..1ca6584 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 c75abe4..b79e071 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);