Commit 885932e3 authored by Francois Cartegnie's avatar Francois Cartegnie

packetizer: h264: fix CreateRbspFromNAL argument type

and possibly uninitialized
parent 4392fc87
...@@ -896,7 +896,7 @@ static void ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice ...@@ -896,7 +896,7 @@ static void ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
uint8_t *pb_dec; uint8_t *pb_dec;
int i_dec; size_t i_dec = 0;
int i_slice_type; int i_slice_type;
slice_t slice; slice_t slice;
bs_t s; bs_t s;
...@@ -1005,7 +1005,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag ) ...@@ -1005,7 +1005,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
uint8_t *pb_dec; uint8_t *pb_dec;
int i_dec; size_t i_dec = 0;
/* */ /* */
CreateRbspFromNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5], p_frag->i_buffer - 5 ); CreateRbspFromNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
...@@ -1013,7 +1013,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag ) ...@@ -1013,7 +1013,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
return; return;
/* The +1 is for rbsp trailing bits */ /* The +1 is for rbsp trailing bits */
for( int i_used = 0; i_used+1 < i_dec; ) for( size_t i_used = 0; i_used+1 < i_dec; )
{ {
/* Read type */ /* Read type */
int i_type = 0; int i_type = 0;
......
...@@ -107,7 +107,7 @@ struct nal_pps ...@@ -107,7 +107,7 @@ struct nal_pps
int i_pic_order_present_flag; int i_pic_order_present_flag;
}; };
static inline void CreateRbspFromNAL( uint8_t **pp_ret, int *pi_ret, static inline void CreateRbspFromNAL( uint8_t **pp_ret, size_t *pi_ret,
const uint8_t *src, int i_src ) const uint8_t *src, int i_src )
{ {
uint8_t *dst = malloc( i_src ); uint8_t *dst = malloc( i_src );
......
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