Re: [Gstreamer-openmax] [PATCH 5/8] Add component-role support

[Felipe C. <fel...@gm...>]

On Mon, Mar 29, 2010 at 4:08 PM, Rob Clark <ro...@ti...> wrote:
> ---
> v2: use strncpy since now component-role is coming from a config file
> rather than a built in table

> +<<<<<<< HEAD
> +/* for now, to keep gst out of g_omx.. if later g_omx becomes gstomx
> + * then this could be combined with the existing g_omx_core_new()
> + * and g_omx_core_init() could be made static/private
> + */
> +void *
> +gstomx_core_new (void *object, GType type)
> +{
> +    GOmxCore *core = g_omx_core_new (object);
> +    gstomx_get_component_info (core, type);
> +    g_omx_core_init (core);
> +    return core;
> +=======

Looks like there are some unresolved conflicts.

-- 
Felipe Contreras