mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-21 15:56:42 +00:00
format: use GST_FORMAT_UNDEFINED and few casts to GstFormat
Fixes warning #188: enumerated type mixed with another type reported by ICC.
This commit is contained in:
parent
0c0dc0441f
commit
11e287529d
1 changed files with 5 additions and 5 deletions
|
@ -49,7 +49,7 @@ static GstFormatDefinition standard_definitions[] = {
|
||||||
{GST_FORMAT_TIME, "time", "Time", 0},
|
{GST_FORMAT_TIME, "time", "Time", 0},
|
||||||
{GST_FORMAT_BUFFERS, "buffers", "Buffers", 0},
|
{GST_FORMAT_BUFFERS, "buffers", "Buffers", 0},
|
||||||
{GST_FORMAT_PERCENT, "percent", "Percent", 0},
|
{GST_FORMAT_PERCENT, "percent", "Percent", 0},
|
||||||
{0, NULL, NULL, 0}
|
{GST_FORMAT_UNDEFINED, NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -144,8 +144,8 @@ gst_format_register (const gchar * nick, const gchar * description)
|
||||||
GstFormatDefinition *format;
|
GstFormatDefinition *format;
|
||||||
GstFormat query;
|
GstFormat query;
|
||||||
|
|
||||||
g_return_val_if_fail (nick != NULL, 0);
|
g_return_val_if_fail (nick != NULL, GST_FORMAT_UNDEFINED);
|
||||||
g_return_val_if_fail (description != NULL, 0);
|
g_return_val_if_fail (description != NULL, GST_FORMAT_UNDEFINED);
|
||||||
|
|
||||||
query = gst_format_get_by_nick (nick);
|
query = gst_format_get_by_nick (nick);
|
||||||
if (query != GST_FORMAT_UNDEFINED)
|
if (query != GST_FORMAT_UNDEFINED)
|
||||||
|
@ -153,7 +153,7 @@ gst_format_register (const gchar * nick, const gchar * description)
|
||||||
|
|
||||||
g_static_mutex_lock (&mutex);
|
g_static_mutex_lock (&mutex);
|
||||||
format = g_slice_new (GstFormatDefinition);
|
format = g_slice_new (GstFormatDefinition);
|
||||||
format->value = _n_values;
|
format->value = (GstFormat) _n_values;
|
||||||
format->nick = g_strdup (nick);
|
format->nick = g_strdup (nick);
|
||||||
format->description = g_strdup (description);
|
format->description = g_strdup (description);
|
||||||
format->quark = g_quark_from_static_string (format->nick);
|
format->quark = g_quark_from_static_string (format->nick);
|
||||||
|
@ -182,7 +182,7 @@ gst_format_get_by_nick (const gchar * nick)
|
||||||
{
|
{
|
||||||
GstFormatDefinition *format;
|
GstFormatDefinition *format;
|
||||||
|
|
||||||
g_return_val_if_fail (nick != NULL, 0);
|
g_return_val_if_fail (nick != NULL, GST_FORMAT_UNDEFINED);
|
||||||
|
|
||||||
g_static_mutex_lock (&mutex);
|
g_static_mutex_lock (&mutex);
|
||||||
format = g_hash_table_lookup (_nick_to_format, nick);
|
format = g_hash_table_lookup (_nick_to_format, nick);
|
||||||
|
|
Loading…
Reference in a new issue