mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix compile errors on macosx

Browse source 
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'
This commit is contained in:
Rob Clark 2010-12-17 19:06:27 -06:00
parent 5bfe1baab3
commit aa07af41f3
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/pbutils/encoding-profile.c
View file

@ -235,7 +235,7 @@ gst_encoding_profile_get_preset (GstEncodingProfile * profile)
* Returns: The number of time the profile is used in its parent * Returns: The number of time the profile is used in its parent
* container profile. If 0, it is not a mandatory stream * container profile. If 0, it is not a mandatory stream
*/ */
const guint guint
gst_encoding_profile_get_presence (GstEncodingProfile * profile) gst_encoding_profile_get_presence (GstEncodingProfile * profile)
{ {
return profile->presence; return profile->presence;

2
gst-libs/gst/pbutils/encoding-profile.h
View file

@ -131,7 +131,7 @@ const gchar * gst_encoding_profile_get_name(GstEncodingProfile *profile);
const gchar * gst_encoding_profile_get_description(GstEncodingProfile *profile); const gchar * gst_encoding_profile_get_description(GstEncodingProfile *profile);
const GstCaps * gst_encoding_profile_get_format(GstEncodingProfile *profile); const GstCaps * gst_encoding_profile_get_format(GstEncodingProfile *profile);
const gchar * gst_encoding_profile_get_preset(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); const GstCaps * gst_encoding_profile_get_restriction(GstEncodingProfile *profile);
void gst_encoding_profile_set_name(GstEncodingProfile *profile, const gchar *name); void gst_encoding_profile_set_name(GstEncodingProfile *profile, const gchar *name);

6
gst/encoding/gstencodebin.c
View file

@ -451,7 +451,8 @@ stream_profile_used_count (GstEncodeBin * ebin, GstEncodingProfile * sprof)
static inline GstEncodingProfile * static inline GstEncodingProfile *
next_unused_stream_profile (GstEncodeBin * ebin, GType ptype, GstCaps * caps) 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)) { if (G_UNLIKELY (ptype == G_TYPE_NONE && caps != NULL)) {
/* Identify the profile type based on raw caps */ /* 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; ptype = GST_TYPE_ENCODING_AUDIO_PROFILE;
/* else if (gst_caps_can_intersect (ebin->raw_text_caps, caps)) */ /* else if (gst_caps_can_intersect (ebin->raw_text_caps, caps)) */
/* ptype = GST_TYPE_ENCODING_TEXT_PROFILE; */ /* 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)) { if (GST_IS_ENCODING_CONTAINER_PROFILE (ebin->profile)) {