Commit d605f165 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix a bunch of signedness warnings

parent 9d678878
......@@ -99,7 +99,7 @@ vlc_module_begin();
add_submodule();
set_description( _("DTS audio packetizer") );
set_capability( "packetizer", 10 );
set_callbacks( OpenPacketizer, NULL );
set_callbacks( OpenPacketizer, CloseDecoder );
vlc_module_end();
/*****************************************************************************
......
......@@ -239,10 +239,10 @@ int E_(OpenDemux)( vlc_object_t *p_this )
msg_Dbg( p_demux, " - format = %s (%s)",
p_sys->fmt->name, p_sys->fmt->long_name );
msg_Dbg( p_demux, " - start time = "I64Fd,
( p_sys->ic->start_time != AV_NOPTS_VALUE ) ?
( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
p_sys->ic->start_time * 1000000 / AV_TIME_BASE : -1 );
msg_Dbg( p_demux, " - duration = "I64Fd,
( p_sys->ic->duration != AV_NOPTS_VALUE ) ?
( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE ) ?
p_sys->ic->duration * 1000000 / AV_TIME_BASE : -1 );
return VLC_SUCCESS;
......@@ -256,6 +256,7 @@ void E_(CloseDemux)( vlc_object_t *p_this )
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
if( p_sys->tk ) free( p_sys->tk );
if( p_sys->ic ) av_close_input_file( p_sys->ic );
if( p_sys->io_buffer ) free( p_sys->io_buffer );
free( p_sys );
......@@ -288,14 +289,14 @@ static int Demux( demux_t *p_demux )
memcpy( p_frame->p_buffer, pkt.data, pkt.size );
i_start_time = ( p_sys->ic->start_time != AV_NOPTS_VALUE ) ?
i_start_time = ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
p_sys->ic->start_time : 0;
p_frame->i_dts = ( pkt.dts == AV_NOPTS_VALUE ) ?
p_frame->i_dts = ( pkt.dts == (int64_t)AV_NOPTS_VALUE ) ?
0 : (pkt.dts - i_start_time) * 1000000 *
p_sys->ic->streams[pkt.stream_index]->time_base.num /
p_sys->ic->streams[pkt.stream_index]->time_base.den;
p_frame->i_pts = ( pkt.pts == AV_NOPTS_VALUE ) ?
p_frame->i_pts = ( pkt.pts == (int64_t)AV_NOPTS_VALUE ) ?
0 : (pkt.pts - i_start_time) * 1000000 *
p_sys->ic->streams[pkt.stream_index]->time_base.num /
p_sys->ic->streams[pkt.stream_index]->time_base.den;
......@@ -338,7 +339,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*pf = (double)stream_Tell( p_demux->s ) / (double)i64;
}
if( (p_sys->ic->duration != AV_NOPTS_VALUE) && (p_sys->i_pcr > 0) )
if( (p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE) && (p_sys->i_pcr > 0) )
{
*pf = (double)p_sys->i_pcr / (double)p_sys->ic->duration;
}
......@@ -353,10 +354,10 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
int64_t i_size = stream_Size( p_demux->s );
i64 = p_sys->i_pcr * i_size / i64 * f;
if( p_sys->ic->start_time != AV_NOPTS_VALUE )
if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
i64 += p_sys->ic->start_time;
if( p_sys->ic->duration != AV_NOPTS_VALUE )
if( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE )
i64 = p_sys->ic->duration * f;
msg_Warn( p_demux, "DEMUX_SET_POSITION: "I64Fd, i64 );
......@@ -372,7 +373,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->ic->duration != AV_NOPTS_VALUE )
if( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE )
{
*pi64 = p_sys->ic->duration;
}
......@@ -386,7 +387,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_SET_TIME:
i64 = (int64_t)va_arg( args, int64_t );
if( p_sys->ic->start_time != AV_NOPTS_VALUE )
if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
i64 += p_sys->ic->start_time;
msg_Warn( p_demux, "DEMUX_SET_TIME: "I64Fd, i64 );
......
......@@ -977,7 +977,7 @@ static int Open ( vlc_object_t *p_this )
if( p_enc->fmt_in.video.i_aspect > 0 )
{
int64_t i_num, i_den;
int i_dst_num, i_dst_den;
unsigned int i_dst_num, i_dst_den;
i_num = p_enc->fmt_in.video.i_aspect *
(int64_t)p_enc->fmt_in.video.i_height;
......
......@@ -1837,7 +1837,7 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec )
*
****************************************************************************/
static void AVI_ParseStreamHeader( vlc_fourcc_t i_id,
int *pi_number, int *pi_type )
unsigned int *pi_number, unsigned int *pi_type )
{
#define SET_PTR( p, v ) if( p ) *(p) = (v);
int c1, c2;
......
......@@ -157,7 +157,7 @@ static char* GetLine( demux_t *p_demux, int *p_pos )
msg_Err( p_demux, "out of memory" );
return NULL;
}
strncpy ( p_line, p_buf, i );
strncpy ( p_line, (char *)p_buf, i );
p_line[i] = '\0';
// msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line );
return p_line;
......@@ -215,8 +215,8 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
msg_Warn( p_demux, "separator %s does not match %s", psz_line,
p_sys->psz_separator );
}
free( psz_line );
}
free( psz_line );
psz_line = GetLine( p_demux, &i_pos );
while( psz_line && *psz_line )
{
......
......@@ -1522,14 +1522,14 @@ static int GetSystemKey( uint32_t *p_sys_key, vlc_bool_t b_ipod )
/* Combine our system info hash with additional secret data. The resulting
* MD5 hash will be our system key. */
InitMD5( &md5 );
AddMD5( &md5, p_secret5, 8 );
AddMD5( &md5, (const uint8_t*)p_secret5, 8 );
if( !b_ipod )
{
AddMD5( &md5, (uint8_t *)p_system_hash, 6 );
AddMD5( &md5, (uint8_t *)p_system_hash, 6 );
AddMD5( &md5, (uint8_t *)p_system_hash, 6 );
AddMD5( &md5, p_secret6, 8 );
AddMD5( &md5, (const uint8_t *)p_system_hash, 6 );
AddMD5( &md5, (const uint8_t *)p_system_hash, 6 );
AddMD5( &md5, (const uint8_t *)p_system_hash, 6 );
AddMD5( &md5, (const uint8_t*)p_secret6, 8 );
}
else
{
......
......@@ -65,13 +65,13 @@
MP4_GET3BYTES( p_void->i_flags )
#define MP4_GETSTRINGZ( p_str ) \
if( ( i_read > 0 )&&(p_peek[0] ) ) \
if( ( i_read > 0 )&&( p_peek[0] ) ) \
{ \
p_str = calloc( sizeof( char ), __MIN( strlen( p_peek ), i_read )+1);\
memcpy( p_str, p_peek, __MIN( strlen( p_peek ), i_read ) ); \
p_str[__MIN( strlen( p_peek ), i_read )] = 0; \
p_peek += strlen( p_str ) + 1; \
i_read -= strlen( p_str ) + 1; \
p_str = calloc( sizeof( char ), __MIN( strlen( (char*)p_peek ), i_read )+1);\
memcpy( p_str, p_peek, __MIN( strlen( (char*)p_peek ), i_read ) ); \
p_str[__MIN( strlen( (char*)p_peek ), i_read )] = 0; \
p_peek += strlen( (char *)p_str ) + 1; \
i_read -= strlen( (char *)p_str ) + 1; \
} \
else \
{ \
......
......@@ -675,7 +675,7 @@ static int Demux( demux_t *p_demux )
p_block->i_buffer = i_size + 1;
/* convert \r -> \n */
while( ( p = strchr( p_block->p_buffer, '\r' ) ) )
while( ( p = strchr( (char*)p_block->p_buffer, '\r' ) ) )
{
*p = '\n';
}
......
......@@ -171,7 +171,7 @@ static void Close( vlc_object_t *p_this )
if( tk->p_subpackets[ j ] )
block_Release( tk->p_subpackets[ j ] );
}
if( !tk->i_subpackets ) free( tk->p_subpackets );
if( tk->i_subpackets ) free( tk->p_subpackets );
free( tk );
}
......@@ -702,7 +702,7 @@ static int HeaderRead( demux_t *p_demux )
msg_Dbg( p_demux, "object %4.4s size=%d version=%d",
(char*)&i_id, i_size, i_version );
if( i_size < 10 )
if( (i_size < 10) && (i_id != VLC_FOURCC('D','A','T','A')) )
{
msg_Dbg( p_demux, "invalid size for object %4.4s", (char*)&i_id );
return VLC_EGENERIC;
......
......@@ -1312,7 +1312,7 @@ bool PlaylistFileDropTarget::OnDropFiles( wxCoord x, wxCoord y,
playlist_ItemNew( p->p_playlist, psz_utf8, psz_utf8 );
playlist_NodeAddItem( p->p_playlist, p_item, p->i_current_view,
p_dest, PLAYLIST_PREPARSE, i_pos );
wxDnDLocaleFree( psz_utf8 );
wxDnDLocaleFree( (char*)psz_utf8 );
}
/* FIXME: having this Rebuild() is dirty */
......
......@@ -761,7 +761,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
i_out_bytes_left = i_out_bytes;
p_in_buffer = psz_string;
p_out_buffer = (char *)psz_unicode;
i_ret = vlc_iconv( iconv_handle, &p_in_buffer, &i_in_bytes,
i_ret = vlc_iconv( iconv_handle, (const char**)&p_in_buffer, &i_in_bytes,
&p_out_buffer, &i_out_bytes_left );
vlc_iconv_close( iconv_handle );
......@@ -780,7 +780,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
{
uint32_t *p_fribidi_string;
int start_pos, pos = 0;
p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
/* Do bidi conversion line-by-line */
......
......@@ -771,7 +771,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
case HTTPD_MSG_PLAY:
{
char *psz_output, *psz_position, ip[NI_MAXNUMERICHOST];
char *psz_output, ip[NI_MAXNUMERICHOST];
int i, i_port_audio = 0, i_port_video = 0;
/* for now only multicast so easy */
......
......@@ -48,7 +48,7 @@ struct sout_stream_sys_t
decoder_t *p_decoder;
image_handler_t *p_image; /* filter for resizing */
int i_height, i_width;
int i_sar_num, i_sar_den;
unsigned int i_sar_num, i_sar_den;
char *psz_id;
vlc_bool_t b_inited;
};
......
......@@ -162,7 +162,7 @@ struct sout_stream_id_t
AVCodec *ff_enc;
AVCodecContext *ff_enc_c;
AVFrame *p_frame;
char *p_buffer_out;
uint8_t *p_buffer_out;
int i_nb_pred;
int16_t *p_samples;
};
......@@ -650,7 +650,7 @@ static void NetCommand( sout_stream_t *p_stream )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
char psz_buffer[10];
int i_len = net_ReadNonBlock( p_stream, p_sys->i_fd, NULL, (char *)&psz_buffer[0],
int i_len = net_ReadNonBlock( p_stream, p_sys->i_fd, NULL, (uint8_t *)&psz_buffer[0],
sizeof( psz_buffer ), 0 );
if ( i_len > 0 )
......
......@@ -47,7 +47,7 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest )
uint8_t *p_v = p_src->V_PIXELS;
vlc_bool_t b_hscale; /* horizontal scaling type */
unsigned int i_vscale; /* vertical scaling type */
int i_vscale; /* vertical scaling type */
unsigned int i_x, i_y; /* horizontal and vertical indexes */
unsigned int i_real_y; /* y % 4 */
int i_right_margin;
......
......@@ -327,7 +327,7 @@ static int Manage( vout_thread_t *p_vout )
{
SDL_Event event; /* SDL event */
vlc_value_t val;
int i_width, i_height, i_x, i_y;
unsigned int i_width, i_height, i_x, i_y;
/* Process events */
while( SDL_PollEvent(&event) )
......@@ -576,7 +576,7 @@ static int Manage( vout_thread_t *p_vout )
*****************************************************************************/
static void Display( vout_thread_t *p_vout, picture_t *p_pic )
{
int x, y, w, h;
unsigned int x, y, w, h;
SDL_Rect disp;
vout_PlacePicture( p_vout, p_vout->p_sys->i_width, p_vout->p_sys->i_height,
......
......@@ -339,7 +339,7 @@ int InitGLX13( vout_thread_t *p_vout )
static void SwapBuffers( vout_thread_t *p_vout )
{
vout_sys_t *p_sys = p_vout->p_sys;
int i_width, i_height, i_x, i_y;
unsigned int i_width, i_height, i_x, i_y;
vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
p_vout->p_sys->p_win->i_height,
......
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