From 3e78ed5d5a8c373db784086b90fd5f772697fc4a Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 22 Feb 2004 15:57:41 +0000 Subject: [PATCH] * all: compilation warning fixes (mainly missings headers). --- modules/codec/rawvideo.c | 3 ++- modules/codec/speex.c | 3 ++- modules/codec/vorbis.c | 3 ++- modules/gui/ncurses/ncurses.c | 10 +++++----- modules/mux/mpeg/ts.c | 4 ++-- modules/video_filter/filter_common.h | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c index 857a44ff7d..8e1cd74d55 100644 --- a/modules/codec/rawvideo.c +++ b/modules/codec/rawvideo.c @@ -2,7 +2,7 @@ * rawvideo.c: Pseudo video decoder/packetizer for raw video data ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: rawvideo.c,v 1.11 2004/01/07 19:20:29 gbazin Exp $ + * $Id: rawvideo.c,v 1.12 2004/02/22 15:57:41 fenrir Exp $ * * Authors: Laurent Aimar * @@ -26,6 +26,7 @@ *****************************************************************************/ #include #include +#include /***************************************************************************** * decoder_sys_t : raw video decoder descriptor diff --git a/modules/codec/speex.c b/modules/codec/speex.c index 639c84d130..1a6dffb6e6 100755 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -2,7 +2,7 @@ * speex.c: speex decoder/packetizer/encoder module making use of libspeex. ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: speex.c,v 1.12 2004/01/29 19:38:17 gbazin Exp $ + * $Id: speex.c,v 1.13 2004/02/22 15:57:41 fenrir Exp $ * * Authors: Gildas Bazin * @@ -26,6 +26,7 @@ *****************************************************************************/ #include #include +#include #include "vlc_playlist.h" #include diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 534ea387da..694085a2b1 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -2,7 +2,7 @@ * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis. ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: vorbis.c,v 1.31 2004/01/29 17:51:07 zorglub Exp $ + * $Id: vorbis.c,v 1.32 2004/02/22 15:57:41 fenrir Exp $ * * Authors: Gildas Bazin * @@ -26,6 +26,7 @@ *****************************************************************************/ #include #include +#include #include "vlc_playlist.h" #include diff --git a/modules/gui/ncurses/ncurses.c b/modules/gui/ncurses/ncurses.c index 686d435ce0..d7c4fdcf6f 100644 --- a/modules/gui/ncurses/ncurses.c +++ b/modules/gui/ncurses/ncurses.c @@ -2,7 +2,7 @@ * ncurses.c : NCurses plugin for vlc ***************************************************************************** * Copyright (C) 2001-2004 VideoLAN - * $Id: ncurses.c,v 1.14 2004/01/25 03:29:02 hartman Exp $ + * $Id: ncurses.c,v 1.15 2004/02/22 15:57:41 fenrir Exp $ * * Authors: Sam Hocevar * Laurent Aimar @@ -497,7 +497,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "prev-title", val ); } - break; + return 1; case ']': if( p_sys->p_input ) @@ -505,7 +505,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "next-title", val ); } - break; + return 1; case '<': if( p_sys->p_input ) @@ -513,7 +513,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "prev-chapter", val ); } - break; + return 1; case '>': if( p_sys->p_input ) @@ -521,7 +521,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "next-chapter", val ); } - break; + return 1; case 'p': if( p_intf->p_sys->p_playlist ) diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index da65c8dd08..7487dc7ba4 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -2,7 +2,7 @@ * ts.c: MPEG-II TS Muxer ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: ts.c,v 1.44 2004/02/17 13:13:31 gbazin Exp $ + * $Id: ts.c,v 1.45 2004/02/22 15:57:41 fenrir Exp $ * * Authors: Laurent Aimar * Eric Petit @@ -396,7 +396,7 @@ static int Open( vlc_object_t *p_this ) ck[0] = val[8]; val[8] = 0; - i_ck = strtol( val, NULL, 16 ) << 32; + i_ck = ((int64_t)strtol( val, NULL, 16 )) << 32; val[8] = ck[0]; i_ck += strtol( &val[8], NULL, 16 ); for( i = 0; i < 8; i++ ) diff --git a/modules/video_filter/filter_common.h b/modules/video_filter/filter_common.h index e0f00d3c88..5ea1c8d97e 100644 --- a/modules/video_filter/filter_common.h +++ b/modules/video_filter/filter_common.h @@ -2,7 +2,7 @@ * filter_common.h: Common filter functions ***************************************************************************** * Copyright (C) 2001, 2002, 2003 VideoLAN - * $Id: filter_common.h,v 1.5 2003/10/26 12:46:55 sigmunau Exp $ + * $Id: filter_common.h,v 1.6 2004/02/22 15:57:41 fenrir Exp $ * * Authors: Samuel Hocevar * @@ -43,7 +43,7 @@ } \ \ /* Allocate the picture */ \ - vout_AllocatePicture( p_vout, p_pic, p_vout->output.i_chroma, \ + vout_AllocatePicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma, \ p_vout->output.i_width, \ p_vout->output.i_height, \ p_vout->output.i_aspect ); \ -- 2.39.2