Skip to content

V
vlc-1.1
Commit fee23a72 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/codec/ogt/*: updated the prototype of the decode function.

parent 136fe6c2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/codec/ogt/cvd.c
View file @ fee23a72
...@@ -75,10 +75,9 @@ vlc_module_end(); ...@@ -75,10 +75,9 @@ vlc_module_end();
*****************************************************************************/ *****************************************************************************/
static block_t *Reassemble( decoder_t *, block_t ** ); static block_t *Reassemble( decoder_t *, block_t ** );
static void Decode ( decoder_t *, block_t ** ); static subpicture_t *Decode( decoder_t *, block_t ** );
static block_t *Packetize( decoder_t *, block_t ** ); static block_t *Packetize( decoder_t *, block_t ** );
/***************************************************************************** /*****************************************************************************
* VCDSubOpen * VCDSubOpen
***************************************************************************** *****************************************************************************
...@@ -140,7 +139,7 @@ static int PacketizerOpen( vlc_object_t *p_this ) ...@@ -140,7 +139,7 @@ static int PacketizerOpen( vlc_object_t *p_this )
/***************************************************************************** /*****************************************************************************
* Decode: * Decode:
*****************************************************************************/ *****************************************************************************/
static void static subpicture_t *
Decode ( decoder_t *p_dec, block_t **pp_block ) Decode ( decoder_t *p_dec, block_t **pp_block )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
...@@ -172,6 +171,7 @@ Decode ( decoder_t *p_dec, block_t **pp_block ) ...@@ -172,6 +171,7 @@ Decode ( decoder_t *p_dec, block_t **pp_block )
VCDSubInitSubtitleBlock ( p_sys ); VCDSubInitSubtitleBlock ( p_sys );
} }
return NULL;
} }
/***************************************************************************** /*****************************************************************************
......
modules/codec/ogt/ogt.c
View file @ fee23a72
...@@ -72,10 +72,9 @@ vlc_module_end(); ...@@ -72,10 +72,9 @@ vlc_module_end();
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static block_t *Reassemble( decoder_t *, block_t ** ); static block_t *Reassemble ( decoder_t *, block_t ** );
static void Decode ( decoder_t *, block_t ** ); static subpicture_t *Decode( decoder_t *, block_t ** );
static block_t *Packetize( decoder_t *, block_t ** ); static block_t *Packetize ( decoder_t *, block_t ** );
/***************************************************************************** /*****************************************************************************
* VCDSubOpen * VCDSubOpen
...@@ -138,7 +137,7 @@ static int PacketizerOpen( vlc_object_t *p_this ) ...@@ -138,7 +137,7 @@ static int PacketizerOpen( vlc_object_t *p_this )
/***************************************************************************** /*****************************************************************************
* Decode: * Decode:
*****************************************************************************/ *****************************************************************************/
static void static subpicture_t *
Decode ( decoder_t *p_dec, block_t **pp_block ) Decode ( decoder_t *p_dec, block_t **pp_block )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
...@@ -170,6 +169,7 @@ Decode ( decoder_t *p_dec, block_t **pp_block ) ...@@ -170,6 +169,7 @@ Decode ( decoder_t *p_dec, block_t **pp_block )
VCDSubInitSubtitleBlock ( p_sys ); VCDSubInitSubtitleBlock ( p_sys );
} }
return NULL;
} }
/***************************************************************************** /*****************************************************************************
......
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