Skip to content

V
vlc-2-2
Commit 4e7174c1 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/*: warning fixes.

parent 4364ef90
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
modules/access/dvdread/input.h
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* input.h: thread structure of the DVD plugin
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: input.h,v 1.1 2002/08/04 17:23:42 sam Exp $
* $Id: input.h,v 1.2 2003/01/23 15:52:04 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -39,11 +39,11 @@ typedef struct thread_dvd_data_s
ifo_handle_t * p_vmg_file;
ifo_handle_t * p_vts_file;
int i_title;
int i_chapter;
int i_angle;
int i_angle_nb;
unsigned int i_title;
unsigned int i_chapter;
unsigned int i_angle;
unsigned int i_angle_nb;
tt_srpt_t * p_tt_srpt;
pgc_t * p_cur_pgc;
......@@ -51,14 +51,14 @@ typedef struct thread_dvd_data_s
dsi_t dsi_pack;
int i_ttn;
unsigned int i_pack_len;
unsigned int i_cur_block;
unsigned int i_next_vobu;
unsigned int i_end_block;
int i_cur_cell;
int i_next_cell;
unsigned int i_cur_cell;
unsigned int i_next_cell;
vlc_bool_t b_eoc;
} thread_dvd_data_t;
modules/access_output/udp.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* udp.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $
* $Id: udp.c,v 1.2 2003/01/23 15:52:04 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -97,7 +97,7 @@ typedef struct sout_access_data_s
uint16_t i_sequence_number;
uint32_t i_ssrc;
int i_mtu;
unsigned int i_mtu;
sout_buffer_t *p_buffer;
......@@ -263,7 +263,7 @@ static void Close( vlc_object_t * p_this )
static int Write( sout_instance_t *p_sout, sout_buffer_t *p_buffer )
{
sout_access_data_t *p_access = (sout_access_data_t*)p_sout->p_access_data;
int i_write;
unsigned int i_write;
while( p_buffer )
{
......
modules/codec/mpeg_audio.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: mpeg_audio.c,v 1.5 2003/01/16 14:08:39 massiot Exp $
* $Id: mpeg_audio.c,v 1.6 2003/01/23 15:52:04 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -526,6 +526,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
break;
default:
break;
}
}
else
......
modules/codec/vorbis.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* vorbis.c: vorbis decoder module making use of libvorbis.
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: vorbis.c,v 1.11 2003/01/02 20:48:28 gbazin Exp $
* $Id: vorbis.c,v 1.12 2003/01/23 15:52:04 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -184,7 +184,7 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
}
/* parse the vorbis comment */
{
input_thread_t *p_input = p_fifo->p_parent;
input_thread_t *p_input = (input_thread_t *)p_fifo->p_parent;
input_info_category_t *p_cat = input_InfoCategory( p_input,
"Vorbis Comment" );
int i = 0;
......
modules/demux/avi/avi.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.28 2003/01/23 13:44:21 fenrir Exp $
* $Id: avi.c,v 1.29 2003/01/23 15:52:04 sam Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -683,7 +683,7 @@ static void AVI_StreamStop( input_thread_t *p_input,
static int AVI_StreamStopFinishedStreams( input_thread_t *p_input,
demux_sys_t *p_avi )
{
int unsigned i_stream;
unsigned int i_stream;
int b_end;
for( i_stream = 0,b_end = VLC_TRUE;
......@@ -925,7 +925,7 @@ static int AVIInit( vlc_object_t * p_this )
p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"",
p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" );
}
/* now read info on each stream and create ES */
p_avi->pp_info = calloc( p_avi->i_streams,
sizeof( avi_stream_t* ) );
......@@ -1958,7 +1958,7 @@ static int AVIDemux_Seekable( input_thread_t *p_input )
/* read thoses data */
if( p_stream->i_samplesize )
{
int i_toread;
unsigned int i_toread;
if( ( i_toread = toread[i_stream].i_toread ) <= 0 )
{
......
modules/gui/gtk/menu.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* menu.c : functions to handle menu items.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: menu.c,v 1.5 2003/01/22 00:32:32 fenrir Exp $
* $Id: menu.c,v 1.6 2003/01/23 15:52:04 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -341,7 +341,7 @@ static void GtkPopupVoutDeviceToggle( GtkCheckMenuItem * menuitem, gpointer user
static void GtkDeinterlaceUpdate( intf_thread_t *p_intf, char *psz_mode )
{
char *psz_filter;
int i;
unsigned int i;
psz_filter = config_GetPsz( p_intf, "filter" );
......
modules/gui/gtk/playlist.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* gtk_playlist.c : Interface for the playlist dialog
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: playlist.c,v 1.2 2002/08/08 22:28:22 sam Exp $
* $Id: playlist.c,v 1.3 2003/01/23 15:52:04 sam Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -611,8 +611,8 @@ static GList * GtkReadFiles( intf_thread_t * p_intf, gchar * psz_fsname )
*/
int GtkAppendList( playlist_t * p_playlist, int i_pos, GList * p_list )
{
guint i_dummy;
guint i_length;
int i_dummy;
int i_length;
i_length = g_list_length( p_list );
......
modules/packetizer/copy.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* copy.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: copy.c,v 1.3 2003/01/19 08:27:28 fenrir Exp $
* $Id: copy.c,v 1.4 2003/01/23 15:52:04 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -315,7 +315,7 @@ static void PacketizeThread( packetizer_thread_t *p_pack )
{
sout_buffer_t *p_sout_buffer;
pes_packet_t *p_pes;
size_t i_size;
ssize_t i_size;
/* **** get samples count **** */
input_ExtractPES( p_pack->p_fifo, &p_pes );
......@@ -334,7 +334,7 @@ static void PacketizeThread( packetizer_thread_t *p_pack )
{
pes_packet_t *p_pes_next;
data_packet_t *p_data;
size_t i_buffer;
ssize_t i_buffer;
p_sout_buffer =
sout_BufferNew( p_pack->p_sout_input->p_sout, i_size );
......@@ -348,7 +348,7 @@ static void PacketizeThread( packetizer_thread_t *p_pack )
p_data != NULL && i_buffer < i_size;
p_data = p_data->p_next)
{
size_t i_copy;
ssize_t i_copy;
i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
i_size - i_buffer );
......
modules/packetizer/mpeg4audio.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* mpeg4audio.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mpeg4audio.c,v 1.1 2003/01/08 10:26:49 fenrir Exp $
* $Id: mpeg4audio.c,v 1.2 2003/01/23 15:52:04 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -219,7 +219,6 @@ static int InitThread( packetizer_thread_t *p_pack )
}
else
{
int i_wf = sizeof( WAVEFORMATEX ) + 5;
/* we will try to create a AAC Config from adts */
p_pack->output_format.i_cat = UNKNOWN_ES;
p_pack->output_format.i_fourcc = VLC_FOURCC( 'n', 'u', 'l', 'l' );
......@@ -257,7 +256,7 @@ static void PacketizeThreadMPEG4( packetizer_thread_t *p_pack )
{
sout_buffer_t *p_sout_buffer;
pes_packet_t *p_pes;
size_t i_size;
ssize_t i_size;
/* **** get samples count **** */
input_ExtractPES( p_pack->p_fifo, &p_pes );
......@@ -279,7 +278,7 @@ static void PacketizeThreadMPEG4( packetizer_thread_t *p_pack )
if( i_size > 0 )
{
data_packet_t *p_data;
size_t i_buffer;
ssize_t i_buffer;
p_sout_buffer =
sout_BufferNew( p_pack->p_sout_input->p_sout, i_size );
......@@ -295,7 +294,7 @@ static void PacketizeThreadMPEG4( packetizer_thread_t *p_pack )
{
size_t i_copy;
i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
i_size - i_buffer );
if( i_copy > 0 )
{
......
modules/packetizer/mpeg4video.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* mpeg4video.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mpeg4video.c,v 1.6 2003/01/19 08:27:28 fenrir Exp $
* $Id: mpeg4video.c,v 1.7 2003/01/23 15:52:04 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -247,7 +247,7 @@ static void PacketizeThread( packetizer_thread_t *p_pack )
{
sout_buffer_t *p_sout_buffer;
pes_packet_t *p_pes;
size_t i_size;
ssize_t i_size;
/* **** get samples count **** */
input_ExtractPES( p_pack->p_fifo, &p_pes );
......@@ -266,7 +266,7 @@ static void PacketizeThread( packetizer_thread_t *p_pack )
{
pes_packet_t *p_pes_next;
data_packet_t *p_data;
size_t i_buffer;
ssize_t i_buffer;
p_sout_buffer =
sout_BufferNew( p_pack->p_sout_input->p_sout, i_size );
......@@ -280,7 +280,7 @@ static void PacketizeThread( packetizer_thread_t *p_pack )
p_data != NULL && i_buffer < i_size;
p_data = p_data->p_next)
{
size_t i_copy;
ssize_t i_copy;
i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
i_size - i_buffer );
......
modules/packetizer/mpegvideo.c
View file @ 4e7174c1
......@@ -2,7 +2,7 @@
* mpegvideo.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mpegvideo.c,v 1.7 2003/01/22 04:51:16 fenrir Exp $
* $Id: mpegvideo.c,v 1.8 2003/01/23 15:52:04 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -181,7 +181,7 @@ static const double pd_frame_rates[16] =
static int CopyUntilNextStartCode( packetizer_t *p_pack,
sout_buffer_t *p_sout_buffer,
int *pi_pos )
unsigned int *pi_pos )
{
int i_copy = 0;
......
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