Commit a793be38 authored by Sam Hocevar's avatar Sam Hocevar

* ALL: fixes for various compilation warnings and spelling errors.

parent 1f4c177f
...@@ -305,7 +305,7 @@ void E_(Close) ( vlc_object_t *p_this ) ...@@ -305,7 +305,7 @@ void E_(Close) ( vlc_object_t *p_this )
{ {
input_thread_t * p_input = (input_thread_t *)p_this; input_thread_t * p_input = (input_thread_t *)p_this;
input_socket_t * p_satellite; input_socket_t * p_satellite;
int i_es_index; unsigned int i_es_index;
if ( p_input->stream.p_selected_program ) if ( p_input->stream.p_selected_program )
{ {
...@@ -336,7 +336,7 @@ static ssize_t SatelliteRead( input_thread_t * p_input, byte_t * p_buffer, ...@@ -336,7 +336,7 @@ static ssize_t SatelliteRead( input_thread_t * p_input, byte_t * p_buffer,
input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
ssize_t i_ret; ssize_t i_ret;
int i; unsigned int i;
/* if not set, set filters to the PMTs */ /* if not set, set filters to the PMTs */
for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
...@@ -381,7 +381,7 @@ static int SatelliteSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -381,7 +381,7 @@ static int SatelliteSetArea( input_thread_t * p_input, input_area_t * p_area )
int SatelliteSetProgram( input_thread_t * p_input, int SatelliteSetProgram( input_thread_t * p_input,
pgrm_descriptor_t * p_new_prg ) pgrm_descriptor_t * p_new_prg )
{ {
int i_es_index; unsigned int i_es_index;
if ( p_input->stream.p_selected_program ) if ( p_input->stream.p_selected_program )
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dv.c: a decoder for DV video * dv.c: a decoder for DV video
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: dv.c,v 1.3 2002/11/28 17:34:59 sam Exp $ * $Id: dv.c,v 1.4 2003/01/28 16:57:28 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -75,7 +75,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo ) ...@@ -75,7 +75,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
{ {
uint8_t *p_buffer; uint8_t *p_buffer;
pes_packet_t *p_pes = NULL; pes_packet_t *p_pes = NULL;
int i_data = 120000; unsigned int i_data = 120000;
int i_aspect; int i_aspect;
bit_stream_t bit_stream; bit_stream_t bit_stream;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2 * decoder.c: AAC decoder using libfaad2
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: decoder.c,v 1.20 2003/01/25 18:09:30 fenrir Exp $ * $Id: decoder.c,v 1.21 2003/01/28 16:57:28 sam Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -261,7 +261,7 @@ static int InitThread( adec_thread_t * p_adec ) ...@@ -261,7 +261,7 @@ static int InitThread( adec_thread_t * p_adec )
return( -1 ); return( -1 );
} }
msg_Dbg( p_adec->p_fifo, msg_Dbg( p_adec->p_fifo,
"faad intitialized, samplerate:%dHz channels:%d", "faad intitialized, samplerate: %ldHz channels: %d",
i_rate, i_rate,
i_nb_channels ); i_nb_channels );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libavi.c : * libavi.c :
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: libavi.c,v 1.15 2003/01/25 16:58:34 fenrir Exp $ * $Id: libavi.c,v 1.16 2003/01/28 16:57:28 sam Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -384,8 +384,8 @@ static int AVI_ChunkRead_list( input_thread_t *p_input, ...@@ -384,8 +384,8 @@ static int AVI_ChunkRead_list( input_thread_t *p_input,
if( AVI_ChunkRead( p_input, p_chk, p_container, b_seekable ) || if( AVI_ChunkRead( p_input, p_chk, p_container, b_seekable ) ||
( AVI_TellAbsolute( p_input ) >= ( AVI_TellAbsolute( p_input ) >=
(off_t)p_chk->common.p_father->common.i_chunk_pos + (off_t)p_chk->common.p_father->common.i_chunk_pos +
__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) ) (off_t)__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) )
{ {
break; break;
} }
...@@ -928,8 +928,8 @@ int AVI_ChunkReadRoot( input_thread_t *p_input, ...@@ -928,8 +928,8 @@ int AVI_ChunkReadRoot( input_thread_t *p_input,
if( AVI_ChunkRead( p_input, p_chk, p_root, b_seekable ) || if( AVI_ChunkRead( p_input, p_chk, p_root, b_seekable ) ||
( AVI_TellAbsolute( p_input ) >= ( AVI_TellAbsolute( p_input ) >=
(off_t)p_chk->common.p_father->common.i_chunk_pos + (off_t)p_chk->common.p_father->common.i_chunk_pos +
__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) ) (off_t)__EVEN( p_chk->common.p_father->common.i_chunk_size ) ) )
{ {
break; break;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mp4.c : MP4 file input module for vlc * mp4.c : MP4 file input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: mp4.c,v 1.15 2003/01/25 17:57:36 fenrir Exp $ * $Id: mp4.c,v 1.16 2003/01/28 16:57:28 sam Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -165,30 +165,30 @@ static int MP4Init( vlc_object_t * p_this ) ...@@ -165,30 +165,30 @@ static int MP4Init( vlc_object_t * p_this )
switch( p_ftyp->data.p_ftyp->i_major_brand ) switch( p_ftyp->data.p_ftyp->i_major_brand )
{ {
case( FOURCC_isom ): case( FOURCC_isom ):
msg_Info( p_input, msg_Dbg( p_input,
"ISO Media file (isom) version %d.", "ISO Media file (isom) version %d.",
p_ftyp->data.p_ftyp->i_minor_version ); p_ftyp->data.p_ftyp->i_minor_version );
break; break;
default: default:
msg_Info( p_input, msg_Dbg( p_input,
"Unrecognize major file specification (%c%c%c%c).", "unrecognized major file specification (%c%c%c%c).",
p_ftyp->data.p_ftyp->i_major_brand&0xff, p_ftyp->data.p_ftyp->i_major_brand&0xff,
( p_ftyp->data.p_ftyp->i_major_brand >> 8)&0xff, ( p_ftyp->data.p_ftyp->i_major_brand >> 8)&0xff,
( p_ftyp->data.p_ftyp->i_major_brand >> 16 )&0xff, ( p_ftyp->data.p_ftyp->i_major_brand >> 16 )&0xff,
( p_ftyp->data.p_ftyp->i_major_brand >> 24 )&0xff ); ( p_ftyp->data.p_ftyp->i_major_brand >> 24 )&0xff );
break; break;
} }
} }
else else
{ {
msg_Info( p_input, "File Type box missing(assume ISO Media file)" ); msg_Dbg( p_input, "file type box missing (assuming ISO Media file)" );
} }
/* the file need to have one moov box */ /* the file need to have one moov box */
if( MP4_BoxCount( &p_demux->box_root, "/moov" ) != 1 ) if( MP4_BoxCount( &p_demux->box_root, "/moov" ) != 1 )
{ {
msg_Err( p_input, msg_Err( p_input,
"MP4 plugin discarded (%d moov box)", "MP4 plugin discarded (%d moov boxes)",
MP4_BoxCount( &p_demux->box_root, "/moov" ) ); MP4_BoxCount( &p_demux->box_root, "/moov" ) );
// MP4End( p_input ); // MP4End( p_input );
// return( -1 ); // return( -1 );
...@@ -196,7 +196,7 @@ static int MP4Init( vlc_object_t * p_this ) ...@@ -196,7 +196,7 @@ static int MP4Init( vlc_object_t * p_this )
if( !(p_mvhd = MP4_BoxGet( &p_demux->box_root, "/moov/mvhd" ) ) ) if( !(p_mvhd = MP4_BoxGet( &p_demux->box_root, "/moov/mvhd" ) ) )
{ {
msg_Err( p_input, "cannot find /moov/mvhd !" ); msg_Err( p_input, "cannot find /moov/mvhd" );
MP4End( p_input ); MP4End( p_input );
return( -1 ); return( -1 );
} }
...@@ -209,7 +209,7 @@ static int MP4Init( vlc_object_t * p_this ) ...@@ -209,7 +209,7 @@ static int MP4Init( vlc_object_t * p_this )
if( !( p_demux->i_tracks = if( !( p_demux->i_tracks =
MP4_BoxCount( &p_demux->box_root, "/moov/trak" ) ) ) MP4_BoxCount( &p_demux->box_root, "/moov/trak" ) ) )
{ {
msg_Err( p_input, "cannot find any /moov/trak !" ); msg_Err( p_input, "cannot find any /moov/trak" );
MP4End( p_input ); MP4End( p_input );
return( -1 ); return( -1 );
} }
...@@ -427,7 +427,7 @@ static void __MP4End ( vlc_object_t * p_this ) ...@@ -427,7 +427,7 @@ static void __MP4End ( vlc_object_t * p_this )
input_thread_t * p_input = (input_thread_t *)p_this; input_thread_t * p_input = (input_thread_t *)p_this;
demux_sys_t *p_demux = p_input->p_demux_data; demux_sys_t *p_demux = p_input->p_demux_data;
msg_Dbg( p_input, "Freeing all memory" ); msg_Dbg( p_input, "freeing all memory" );
MP4_BoxFree( p_input, &p_demux->box_root ); MP4_BoxFree( p_input, &p_demux->box_root );
for( i_track = 0; i_track < p_demux->i_tracks; i_track++ ) for( i_track = 0; i_track < p_demux->i_tracks; i_track++ )
{ {
...@@ -553,7 +553,7 @@ static int MP4_TrackSynchro( input_thread_t *p_input, track_data_mp4_t *p_track ...@@ -553,7 +553,7 @@ static int MP4_TrackSynchro( input_thread_t *p_input, track_data_mp4_t *p_track
else else
{ {
msg_Dbg( p_input, msg_Dbg( p_input,
"track[Id 0x%x] doesn't provided Sync Sample Box (stss)", "track[Id 0x%x] does not provide Sync Sample Box (stss)",
p_track->i_track_ID ); p_track->i_track_ID );
} }
...@@ -612,12 +612,12 @@ static void MP4_ParseTrack( input_thread_t *p_input, ...@@ -612,12 +612,12 @@ static void MP4_ParseTrack( input_thread_t *p_input,
if( ( p_elst = MP4_BoxGet( p_trak, "edts/elst" ) ) ) if( ( p_elst = MP4_BoxGet( p_trak, "edts/elst" ) ) )
{ {
/* msg_Warn( p_input, "Unhandled box: edts --> FIXME" ); */ /* msg_Warn( p_input, "unhandled box: edts --> FIXME" ); */
} }
if( p_tref ) if( p_tref )
{ {
/* msg_Warn( p_input, "Unhandled box: tref --> FIXME" ); */ /* msg_Warn( p_input, "unhandled box: tref --> FIXME" ); */
} }
p_mdhd = MP4_BoxGet( p_trak, "mdia/mdhd" ); p_mdhd = MP4_BoxGet( p_trak, "mdia/mdhd" );
...@@ -709,7 +709,7 @@ static int MP4_CreateChunksIndex( input_thread_t *p_input, ...@@ -709,7 +709,7 @@ static int MP4_CreateChunksIndex( input_thread_t *p_input,
p_demux_track->i_chunk_count = p_co64->data.p_co64->i_entry_count; p_demux_track->i_chunk_count = p_co64->data.p_co64->i_entry_count;
if( !p_demux_track->i_chunk_count ) if( !p_demux_track->i_chunk_count )
{ {
msg_Warn( p_input, "No chunk defined" ); msg_Warn( p_input, "no chunk defined" );
return( 0 ); return( 0 );
} }
p_demux_track->chunk = calloc( p_demux_track->i_chunk_count, p_demux_track->chunk = calloc( p_demux_track->i_chunk_count,
...@@ -923,7 +923,7 @@ static void MP4_StartDecoder( input_thread_t *p_input, ...@@ -923,7 +923,7 @@ static void MP4_StartDecoder( input_thread_t *p_input,
return; return;
} }
msg_Dbg( p_input, "Starting decoder for track[Id 0x%x]", msg_Dbg( p_input, "starting decoder for track[Id 0x%x]",
p_demux_track->i_track_ID ); p_demux_track->i_track_ID );
/* launch decoder according in chunk we are */ /* launch decoder according in chunk we are */
...@@ -1027,7 +1027,7 @@ static void MP4_StartDecoder( input_thread_t *p_input, ...@@ -1027,7 +1027,7 @@ static void MP4_StartDecoder( input_thread_t *p_input,
default: default:
/* Unknown entry, but don't touch i_fourcc */ /* Unknown entry, but don't touch i_fourcc */
msg_Warn( p_input, msg_Warn( p_input,
"objectTypeIndication(0x%x) unknow (Track[ID 0x%x])", "unknown objectTypeIndication(0x%x) (Track[ID 0x%x])",
p_decconfig->i_objectTypeIndication, p_decconfig->i_objectTypeIndication,
p_demux_track->i_track_ID ); p_demux_track->i_track_ID );
break; break;
...@@ -1180,7 +1180,7 @@ static void MP4_StartDecoder( input_thread_t *p_input, ...@@ -1180,7 +1180,7 @@ static void MP4_StartDecoder( input_thread_t *p_input,
static void MP4_StopDecoder( input_thread_t *p_input, static void MP4_StopDecoder( input_thread_t *p_input,
track_data_mp4_t *p_demux_track ) track_data_mp4_t *p_demux_track )
{ {
msg_Dbg( p_input, "Stopping decoder (track[Id 0x%x])", msg_Dbg( p_input, "stopping decoder (track[Id 0x%x])",
p_demux_track->i_track_ID ); p_demux_track->i_track_ID );
input_UnselectES( p_input, p_demux_track->p_es ); input_UnselectES( p_input, p_demux_track->p_es );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* encoder.c : encoder wrapper plugin for vlc * encoder.c : encoder wrapper plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: encoder.c,v 1.1 2003/01/22 10:41:57 fenrir Exp $ * $Id: encoder.c,v 1.2 2003/01/28 16:57:28 sam Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -170,7 +170,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -170,7 +170,7 @@ static int Init( vout_thread_t *p_vout )
/* *** set wanted input format *** */ /* *** set wanted input format *** */
p_encoder->i_codec = p_vout->p_sys->i_codec; p_encoder->i_codec = p_vout->p_sys->i_codec;
/* *** set prefered properties *** */ /* *** set preferred properties *** */
/* encoder can modify all these values except i_codec */ /* encoder can modify all these values except i_codec */
p_encoder->i_chroma = p_vout->render.i_chroma; p_encoder->i_chroma = p_vout->render.i_chroma;
p_encoder->i_width = p_vout->render.i_width; p_encoder->i_width = p_vout->render.i_width;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins * xcommon.c: Functions common to the X11 and XVideo plugins
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.11 2003/01/28 13:03:13 gbazin Exp $ * $Id: xcommon.c,v 1.12 2003/01/28 16:57:28 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -730,7 +730,7 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -730,7 +730,7 @@ static int ManageVideo( vout_thread_t *p_vout )
ClientMessage, &xevent ) ) ClientMessage, &xevent ) )
{ {
if( (xevent.xclient.message_type == p_vout->p_sys->p_win->wm_protocols) if( (xevent.xclient.message_type == p_vout->p_sys->p_win->wm_protocols)
&& (xevent.xclient.data.l[0] && ((Atom)xevent.xclient.data.l[0]
== p_vout->p_sys->p_win->wm_delete_window ) ) == p_vout->p_sys->p_win->wm_delete_window ) )
{ {
p_vout->p_vlc->b_die = 1; p_vout->p_vlc->b_die = 1;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlcshell.c: a VideoLAN Client plugin for Mozilla * vlcshell.c: a VideoLAN Client plugin for Mozilla
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: vlcshell.cpp,v 1.7 2002/11/28 23:53:03 sigmunau Exp $ * $Id: vlcshell.cpp,v 1.8 2003/01/28 16:57:28 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -546,7 +546,7 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname ) ...@@ -546,7 +546,7 @@ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname )
fprintf(stderr, "NPP_StreamAsFile %s\n", fname); fprintf(stderr, "NPP_StreamAsFile %s\n", fname);
#if USE_LIBVLC #if USE_LIBVLC
VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata; /* VlcPlugin* p_plugin = (VlcPlugin*)instance->pdata; */
/* VLC_AddTarget( p_plugin->i_vlc, fname, /* VLC_AddTarget( p_plugin->i_vlc, fname,
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );*/ PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );*/
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header * libvlc.h: main libvlc header
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.38 2003/01/28 02:03:33 sam Exp $ * $Id: libvlc.h,v 1.39 2003/01/28 16:57:28 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -262,7 +262,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; ...@@ -262,7 +262,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
"If you check this box, IPv4 will be used by default for all UDP and " \ "If you check this box, IPv4 will be used by default for all UDP and " \
"HTTP connections.") "HTTP connections.")
#define CODEC_TEXT N_("choose prefered codec list") #define CODEC_TEXT N_("choose preferred codec list")
#define CODEC_LONGTEXT N_( \ #define CODEC_LONGTEXT N_( \
"This allows you to select the order in which vlc will choose its " \ "This allows you to select the order in which vlc will choose its " \
"codecs. For instance, 'a52old,a52,any' will try the old a52 codec " \ "codecs. For instance, 'a52old,a52,any' will try the old a52 codec " \
...@@ -271,11 +271,11 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; ...@@ -271,11 +271,11 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
"'any' at the end of the list to make sure there is a fallback for the " \ "'any' at the end of the list to make sure there is a fallback for the " \
"types you didn't specify.") "types you didn't specify.")
#define ENCODER_VIDEO_TEXT N_("choose prefered video encoder list") #define ENCODER_VIDEO_TEXT N_("choose preferred video encoder list")
#define ENCODER_VIDEO_LONGTEXT N_( \ #define ENCODER_VIDEO_LONGTEXT N_( \
"This allows you to select the order in which vlc will choose its " \ "This allows you to select the order in which vlc will choose its " \
"codecs. " ) "codecs. " )
#define ENCODER_AUDIO_TEXT N_("choose prefered audio encoder list") #define ENCODER_AUDIO_TEXT N_("choose preferred audio encoder list")
#define ENCODER_AUDIO_LONGTEXT N_( \ #define ENCODER_AUDIO_LONGTEXT N_( \
"This allows you to select the order in which vlc will choose its " \ "This allows you to select the order in which vlc will choose its " \
"codecs. " ) "codecs. " )
...@@ -302,7 +302,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; ...@@ -302,7 +302,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
#define SOUT_ACODEC_LONGTEXT N_( \ #define SOUT_ACODEC_LONGTEXT N_( \
"This allows you to force audio encoding") "This allows you to force audio encoding")
#define PACKETIZER_TEXT N_("choose prefered packetizer list") #define PACKETIZER_TEXT N_("choose preferred packetizer list")
#define PACKETIZER_LONGTEXT N_( \ #define PACKETIZER_LONGTEXT N_( \
"This allows you to select the order in which vlc will choose its " \ "This allows you to select the order in which vlc will choose its " \
"packetizers." ) "packetizers." )
......
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