gst/mpegaudioparse/gstmpegaudioparse.c: Fix build on macosx.

Original commit message from CVS:
* gst/mpegaudioparse/gstmpegaudioparse.c: (head_check):
Fix build on macosx.

diff --git a/ChangeLog b/ChangeLog
index 6067ecce0ccc36afd2c418ff1ea4ab953c5e1b2b..db991383724efe8cce79d4945b91a83ff41b1c19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-26  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+       * gst/mpegaudioparse/gstmpegaudioparse.c: (head_check):
+       Fix build on macosx.
+
 2008-06-13  Stefan Kost  <ensonic@users.sf.net>
 
        * docs/plugins/gst-plugins-ugly-plugins-docs.sgml:

diff --git a/common b/common
index 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8..d9cd98b46aebaf143dc43d8563a3bff650be6a7e 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8
+Subproject commit d9cd98b46aebaf143dc43d8563a3bff650be6a7e

diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index fe17208580d262e00911b7c2ac3c8b7e364c5936..efb30c5f515a82e914ade92b4bda81f62f6cd0be 100644 (file)
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -1406,28 +1406,28 @@ head_check (GstMPEGAudioParse * mp3parse, unsigned long head)
   }
   /* if it's an invalid MPEG version */
   if (((head >> 19) & 3) == 0x1) {
-    GST_WARNING_OBJECT (mp3parse, "invalid MPEG version: 0x%x",
+    GST_WARNING_OBJECT (mp3parse, "invalid MPEG version: 0x%lx",
         (head >> 19) & 3);
     return FALSE;
   }
   /* if it's an invalid layer */
   if (!((head >> 17) & 3)) {
-    GST_WARNING_OBJECT (mp3parse, "invalid layer: 0x%x", (head >> 17) & 3);
+    GST_WARNING_OBJECT (mp3parse, "invalid layer: 0x%lx", (head >> 17) & 3);
     return FALSE;
   }
   /* if it's an invalid bitrate */
   if (((head >> 12) & 0xf) == 0x0) {
-    GST_WARNING_OBJECT (mp3parse, "invalid bitrate: 0x%x."
+    GST_WARNING_OBJECT (mp3parse, "invalid bitrate: 0x%lx."
         "Free format files are not supported yet", (head >> 12) & 0xf);
     return FALSE;
   }
   if (((head >> 12) & 0xf) == 0xf) {
-    GST_WARNING_OBJECT (mp3parse, "invalid bitrate: 0x%x", (head >> 12) & 0xf);
+    GST_WARNING_OBJECT (mp3parse, "invalid bitrate: 0x%lx", (head >> 12) & 0xf);
     return FALSE;
   }
   /* if it's an invalid samplerate */
   if (((head >> 10) & 0x3) == 0x3) {
-    GST_WARNING_OBJECT (mp3parse, "invalid samplerate: 0x%x",
+    GST_WARNING_OBJECT (mp3parse, "invalid samplerate: 0x%lx",
         (head >> 10) & 0x3);
     return FALSE;
   }
@@ -1435,7 +1435,7 @@ head_check (GstMPEGAudioParse * mp3parse, unsigned long head)
   if ((head & 0x3) == 0x2) {
     /* Ignore this as there are some files with emphasis 0x2 that can
      * be played fine. See BGO #537235 */
-    GST_WARNING_OBJECT (mp3parse, "invalid emphasis: 0x%x", head & 0x3);
+    GST_WARNING_OBJECT (mp3parse, "invalid emphasis: 0x%lx", head & 0x3);
   }
 
   return TRUE;