From: Rob Clark <rob@ti.com>
Date: Sat, 18 Dec 2010 01:06:27 +0000 (-0600)
Subject: fix compile errors on macosx
X-Git-Tag: RELEASE-0.10.32~109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa07af41f30cab25bb8b4bc6faa5d9b958306058;p=platform%2Fupstream%2Fgst-plugins-base.git

fix compile errors on macosx

with i686-apple-darwin10-gcc-4.2.1:

encoding-profile.h:134: warning: type qualifiers ignored on function return type
encoding-profile.c:240: warning: type qualifiers ignored on function return type
gstencodebin.c: In function 'next_unused_stream_profile':
gstencodebin.c:454: warning: format '%d' expects type 'int', but argument 8 has type 'GType'
gstencodebin.c:464: warning: format '%d' expects type 'int', but argument 8 has type 'GType'
---

diff --git a/gst-libs/gst/pbutils/encoding-profile.c b/gst-libs/gst/pbutils/encoding-profile.c
index 8c364c887..03be1317c 100644
--- a/gst-libs/gst/pbutils/encoding-profile.c
+++ b/gst-libs/gst/pbutils/encoding-profile.c
@@ -235,7 +235,7 @@ gst_encoding_profile_get_preset (GstEncodingProfile * profile)
  * Returns: The number of time the profile is used in its parent
  * container profile. If 0, it is not a mandatory stream
  */
-const guint
+guint
 gst_encoding_profile_get_presence (GstEncodingProfile * profile)
 {
   return profile->presence;
diff --git a/gst-libs/gst/pbutils/encoding-profile.h b/gst-libs/gst/pbutils/encoding-profile.h
index 3c6f3c3d3..f455a607c 100644
--- a/gst-libs/gst/pbutils/encoding-profile.h
+++ b/gst-libs/gst/pbutils/encoding-profile.h
@@ -131,7 +131,7 @@ const gchar *	gst_encoding_profile_get_name(GstEncodingProfile *profile);
 const gchar *	gst_encoding_profile_get_description(GstEncodingProfile *profile);
 const GstCaps *	gst_encoding_profile_get_format(GstEncodingProfile *profile);
 const gchar *	gst_encoding_profile_get_preset(GstEncodingProfile *profile);
-const guint	gst_encoding_profile_get_presence(GstEncodingProfile *profile);
+guint	gst_encoding_profile_get_presence(GstEncodingProfile *profile);
 const GstCaps *	gst_encoding_profile_get_restriction(GstEncodingProfile *profile);
 
 void	gst_encoding_profile_set_name(GstEncodingProfile *profile, const gchar *name);
diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
index 3ba5a403d..4a126202b 100644
--- a/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@ -451,7 +451,8 @@ stream_profile_used_count (GstEncodeBin * ebin, GstEncodingProfile * sprof)
 static inline GstEncodingProfile *
 next_unused_stream_profile (GstEncodeBin * ebin, GType ptype, GstCaps * caps)
 {
-  GST_DEBUG_OBJECT (ebin, "ptype:%d, caps:%" GST_PTR_FORMAT, ptype, caps);
+  GST_DEBUG_OBJECT (ebin, "ptype:%s, caps:%" GST_PTR_FORMAT,
+      g_type_name (ptype), caps);
 
   if (G_UNLIKELY (ptype == G_TYPE_NONE && caps != NULL)) {
     /* Identify the profile type based on raw caps */
@@ -461,7 +462,8 @@ next_unused_stream_profile (GstEncodeBin * ebin, GType ptype, GstCaps * caps)
       ptype = GST_TYPE_ENCODING_AUDIO_PROFILE;
     /* else if (gst_caps_can_intersect (ebin->raw_text_caps, caps)) */
     /*   ptype = GST_TYPE_ENCODING_TEXT_PROFILE; */
-    GST_DEBUG_OBJECT (ebin, "Detected profile type as being %d", ptype);
+    GST_DEBUG_OBJECT (ebin, "Detected profile type as being %s",
+        g_type_name (ptype));
   }
 
   if (GST_IS_ENCODING_CONTAINER_PROFILE (ebin->profile)) {