Commit 68d880d7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Fix warnings in lpcm, cc and theora

parent fe9d2fd9
...@@ -618,7 +618,7 @@ static void Eia608ParseChannel( eia608_t *h, const uint8_t d[2] ) ...@@ -618,7 +618,7 @@ static void Eia608ParseChannel( eia608_t *h, const uint8_t d[2] )
/* */ /* */
const int d1 = d[0] & 0x7f; const int d1 = d[0] & 0x7f;
const int d2 = d[1] & 0x7f; // const int d2 = d[1] & 0x7f;
if( d1 == 0x14 ) if( d1 == 0x14 )
h->i_channel = 1; h->i_channel = 1;
else if( d1 == 0x1c ) else if( d1 == 0x1c )
...@@ -1143,5 +1143,6 @@ static char *Eia608Text( eia608_t *h, bool b_html ) ...@@ -1143,5 +1143,6 @@ static char *Eia608Text( eia608_t *h, bool b_html )
static void Eia608Exit( eia608_t *h ) static void Eia608Exit( eia608_t *h )
{ {
VLC_UNUSED( h );
} }
...@@ -289,12 +289,11 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block ) ...@@ -289,12 +289,11 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
} }
int i_ret; int i_ret;
unsigned i_padding; unsigned i_padding = 0;
aob_group_t p_aob_group[2]; aob_group_t p_aob_group[2];
switch( p_sys->i_type ) switch( p_sys->i_type )
{ {
case LPCM_VOB: case LPCM_VOB:
i_padding = 0;
i_ret = VobHeader( &i_rate, &i_channels, &i_original_channels, &i_bits, i_ret = VobHeader( &i_rate, &i_channels, &i_original_channels, &i_bits,
p_block->p_buffer ); p_block->p_buffer );
break; break;
...@@ -303,13 +302,12 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block ) ...@@ -303,13 +302,12 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
p_aob_group, p_aob_group,
p_block->p_buffer ); p_block->p_buffer );
break; break;
default:
assert(0);
case LPCM_BD: case LPCM_BD:
i_padding = 0;
i_ret = BdHeader( &i_rate, &i_channels, &i_original_channels, &i_bits, i_ret = BdHeader( &i_rate, &i_channels, &i_original_channels, &i_bits,
p_block->p_buffer ); p_block->p_buffer );
break; break;
default:
assert(0);
} }
if( i_ret || p_block->i_buffer <= p_sys->i_header_size + i_padding ) if( i_ret || p_block->i_buffer <= p_sys->i_header_size + i_padding )
...@@ -792,7 +790,7 @@ static void AobExtract( aout_buffer_t *p_aout_buffer, ...@@ -792,7 +790,7 @@ static void AobExtract( aout_buffer_t *p_aout_buffer,
for( int i = 0; i < 2; i++ ) for( int i = 0; i < 2; i++ )
{ {
const aob_group_t *g = &p_group[1-i]; const aob_group_t *g = &p_group[1-i];
const int i_group_size = 2 * g->i_channels * i_bits / 8; const unsigned int i_group_size = 2 * g->i_channels * i_bits / 8;
if( p_block->i_buffer < i_group_size ) if( p_block->i_buffer < i_group_size )
{ {
......
...@@ -82,7 +82,7 @@ static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** ); ...@@ -82,7 +82,7 @@ static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** );
static picture_t *DecodePacket( decoder_t *, ogg_packet * ); static picture_t *DecodePacket( decoder_t *, ogg_packet * );
static void ParseTheoraComments( decoder_t * ); static void ParseTheoraComments( decoder_t * );
static void theora_CopyPicture( decoder_t *, picture_t *, yuv_buffer * ); static void theora_CopyPicture( picture_t *, yuv_buffer * );
static int OpenEncoder( vlc_object_t *p_this ); static int OpenEncoder( vlc_object_t *p_this );
static void CloseEncoder( vlc_object_t *p_this ); static void CloseEncoder( vlc_object_t *p_this );
...@@ -498,7 +498,7 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) ...@@ -498,7 +498,7 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
p_pic = decoder_NewPicture( p_dec ); p_pic = decoder_NewPicture( p_dec );
if( !p_pic ) return NULL; if( !p_pic ) return NULL;
theora_CopyPicture( p_dec, p_pic, &yuv ); theora_CopyPicture( p_pic, &yuv );
p_pic->date = p_sys->i_pts; p_pic->date = p_sys->i_pts;
...@@ -553,7 +553,7 @@ static void CloseDecoder( vlc_object_t *p_this ) ...@@ -553,7 +553,7 @@ static void CloseDecoder( vlc_object_t *p_this )
* theora_CopyPicture: copy a picture from theora internal buffers to a * theora_CopyPicture: copy a picture from theora internal buffers to a
* picture_t structure. * picture_t structure.
*****************************************************************************/ *****************************************************************************/
static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic, static void theora_CopyPicture( picture_t *p_pic,
yuv_buffer *yuv ) yuv_buffer *yuv )
{ {
int i_plane, i_line, i_dst_stride, i_src_stride; int i_plane, i_line, i_dst_stride, i_src_stride;
......
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