diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-26 14:37:54 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-26 14:37:54 +0200 |
| commit | 5cf8e689440493c51cfc94e178af94f25b04e526 (patch) | |
| tree | fcffdf4cf6ef72bff97316f527e5c72d8182d580 /plugins | |
| parent | d924c30f5b881677c32e10b63c844c20d41d526a (diff) | |
| parent | 185ab7f325da9b8ff3f9c9e16b47d2bea2fc3636 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst/gstmessage.c
gst/gstquery.c
gst/gstregistrychunks.c
gst/gstsegment.c
libs/gst/base/gstbasetransform.c
libs/gst/base/gstbasetransform.h
libs/gst/base/gsttypefindhelper.c
plugins/elements/gsttypefindelement.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/elements/gsttypefindelement.c | 2 | ||||
| -rw-r--r-- | plugins/indexers/gstfileindex.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c index 0757abf3d..9ed0bdfd3 100644 --- a/plugins/elements/gsttypefindelement.c +++ b/plugins/elements/gsttypefindelement.c @@ -884,7 +884,7 @@ gst_type_find_element_activate_src_pull (GstPad * pad, gboolean active) static gboolean gst_type_find_element_activate (GstPad * pad) { - GstTypeFindProbability probability = 0; + GstTypeFindProbability probability = GST_TYPE_FIND_NONE; GstCaps *found_caps = NULL; GstTypeFindElement *typefind; GstQuery *query; diff --git a/plugins/indexers/gstfileindex.c b/plugins/indexers/gstfileindex.c index 727f6ca01..c8c8fb1f5 100644 --- a/plugins/indexers/gstfileindex.c +++ b/plugins/indexers/gstfileindex.c @@ -770,7 +770,7 @@ gst_file_index_add_association (GstIndex * index, GstIndexEntry * entry) } /* this is a hack, we should use a private structure instead */ - sample.format = 0; + sample.format = GST_FORMAT_UNDEFINED; sample.value = GST_INDEX_ASSOC_VALUE (entry, 0); exact = @@ -903,7 +903,7 @@ gst_file_index_get_assoc_entry (GstIndex * index, } /* this is a hack, we should use a private structure instead */ - sample.format = formatx; + sample.format = (GstFormat) formatx; sample.value = value; exact = _fc_bsearch (id_index->array, ARRAY_ROW_SIZE (id_index), @@ -953,7 +953,7 @@ gst_file_index_get_assoc_entry (GstIndex * index, { gint32 flags_be = ARRAY_ROW_FLAGS (row_data); - GST_INDEX_ASSOC_FLAGS (entry) = GINT32_FROM_BE (flags_be); + GST_INDEX_ASSOC_FLAGS (entry) = (GstAssocFlags) GINT32_FROM_BE (flags_be); for (xx = 0; xx < id_index->nformats; xx++) { gint64 val_be = ARRAY_ROW_VALUE (row_data, xx); |