Commit bf153c4e authored by Tristan Matthews's avatar Tristan Matthews

vpx: rename Open/Close

This will avoid ambiguity when adding encoder functions.
parent f9141ac7
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
/**************************************************************************** /****************************************************************************
* Local prototypes * Local prototypes
****************************************************************************/ ****************************************************************************/
static int Open(vlc_object_t *); static int OpenDecoder(vlc_object_t *);
static void Close(vlc_object_t *); static void CloseDecoder(vlc_object_t *);
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -48,7 +48,7 @@ vlc_module_begin () ...@@ -48,7 +48,7 @@ vlc_module_begin ()
set_shortname("vpx") set_shortname("vpx")
set_description(N_("WebM video decoder")) set_description(N_("WebM video decoder"))
set_capability("decoder", 60) set_capability("decoder", 60)
set_callbacks(Open, Close) set_callbacks(OpenDecoder, CloseDecoder)
set_category(CAT_INPUT) set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC) set_subcategory(SUBCAT_INPUT_VCODEC)
vlc_module_end () vlc_module_end ()
...@@ -152,9 +152,9 @@ static picture_t *Decode(decoder_t *dec, block_t **pp_block) ...@@ -152,9 +152,9 @@ static picture_t *Decode(decoder_t *dec, block_t **pp_block)
} }
/***************************************************************************** /*****************************************************************************
* Open: probe the decoder * OpenDecoder: probe the decoder
*****************************************************************************/ *****************************************************************************/
static int Open(vlc_object_t *p_this) static int OpenDecoder(vlc_object_t *p_this)
{ {
decoder_t *dec = (decoder_t *)p_this; decoder_t *dec = (decoder_t *)p_this;
const struct vpx_codec_iface *iface; const struct vpx_codec_iface *iface;
...@@ -208,9 +208,9 @@ static int Open(vlc_object_t *p_this) ...@@ -208,9 +208,9 @@ static int Open(vlc_object_t *p_this)
} }
/***************************************************************************** /*****************************************************************************
* Close: decoder destruction * CloseDecoder: decoder destruction
*****************************************************************************/ *****************************************************************************/
static void Close(vlc_object_t *p_this) static void CloseDecoder(vlc_object_t *p_this)
{ {
decoder_t *dec = (decoder_t *)p_this; decoder_t *dec = (decoder_t *)p_this;
decoder_sys_t *sys = dec->p_sys; decoder_sys_t *sys = dec->p_sys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment