From b0018cc387f323c225c113f11688e516a67429ab Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 17 Aug 2003 20:39:08 +0000 Subject: [PATCH] * all: removed all u8/u16/.... occurences. --- src/input/input_ext-dec.c | 8 ++++---- src/input/input_programs.c | 8 ++++---- src/misc/iso_lang.c | 10 +++++----- src/video_output/video_text.h | 5 +++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/input/input_ext-dec.c b/src/input/input_ext-dec.c index 0e15f6a7d6..c4d966454d 100644 --- a/src/input/input_ext-dec.c +++ b/src/input/input_ext-dec.c @@ -2,7 +2,7 @@ * input_ext-dec.c: services to the decoders ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: input_ext-dec.c,v 1.45 2003/03/04 13:21:19 massiot Exp $ + * $Id: input_ext-dec.c,v 1.46 2003/08/17 20:39:08 fenrir Exp $ * * Authors: Christophe Massiot * @@ -253,7 +253,7 @@ void BitstreamNextDataPacket( bit_stream_t * p_bit_stream ) * UnalignedShowBits : places i_bits bits into the bit buffer, even when * not aligned on a word boundary *****************************************************************************/ -u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) +uint32_t UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) { /* We just fill in the bit buffer. */ while( (unsigned int)p_bit_stream->fifo.i_available < i_bits ) @@ -333,9 +333,9 @@ u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) * them from the buffer, even when the bit stream is not aligned on a word * boundary *****************************************************************************/ -u32 UnalignedGetBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) +uint32_t UnalignedGetBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) { - u32 i_result; + uint32_t i_result; i_result = p_bit_stream->fifo.buffer >> (8 * sizeof(WORD_TYPE) - i_bits); diff --git a/src/input/input_programs.c b/src/input/input_programs.c index f35b67ad57..66772e36c9 100644 --- a/src/input/input_programs.c +++ b/src/input/input_programs.c @@ -2,7 +2,7 @@ * input_programs.c: es_descriptor_t, pgrm_descriptor_t management ***************************************************************************** * Copyright (C) 1999-2002 VideoLAN - * $Id: input_programs.c,v 1.117 2003/08/13 01:45:13 gbazin Exp $ + * $Id: input_programs.c,v 1.118 2003/08/17 20:39:08 fenrir Exp $ * * Authors: Christophe Massiot * @@ -84,7 +84,7 @@ int input_InitStream( input_thread_t * p_input, size_t i_data_len ) { p_input->stream.p_demux_data = NULL; } - + var_Create( p_input, "intf-change", VLC_VAR_BOOL ); val.b_bool = VLC_TRUE; var_Set( p_input, "intf-change", val ); @@ -195,7 +195,7 @@ pgrm_descriptor_t * input_FindProgram( input_thread_t * p_input, * This program descriptor will be referenced in the given stream descriptor *****************************************************************************/ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input, - u16 i_pgrm_id, size_t i_data_len ) + uint16_t i_pgrm_id, size_t i_data_len ) { /* Where to add the pgrm */ pgrm_descriptor_t * p_pgrm = malloc( sizeof(pgrm_descriptor_t) ); @@ -587,7 +587,7 @@ es_descriptor_t * input_FindES( input_thread_t * p_input, uint16_t i_es_id ) * alone (PSI ?) *****************************************************************************/ es_descriptor_t * input_AddES( input_thread_t * p_input, - pgrm_descriptor_t * p_pgrm, u16 i_es_id, + pgrm_descriptor_t * p_pgrm, uint16_t i_es_id, int i_category, char const *psz_desc, size_t i_data_len ) { diff --git a/src/misc/iso_lang.c b/src/misc/iso_lang.c index 9c844d83eb..219e09187e 100644 --- a/src/misc/iso_lang.c +++ b/src/misc/iso_lang.c @@ -2,7 +2,7 @@ * iso_lang.c: function to decode language code (in dvd or a52 for instance). ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: iso_lang.c,v 1.8 2002/11/13 20:51:05 sam Exp $ + * $Id: iso_lang.c,v 1.9 2003/08/17 20:39:08 fenrir Exp $ * * Author: Stéphane Borel * Arnaud de Bossoreille de Ribou @@ -11,7 +11,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -51,10 +51,10 @@ static const iso639_lang_t unknown_language = * DecodeLanguage: gives the long language name from the two-letter * ISO-639 code *****************************************************************************/ -const char * DecodeLanguage( u16 i_code ) +const char * DecodeLanguage( uint16_t i_code ) { const iso639_lang_t * p_lang; - u8 psz_code[3]; + uint8_t psz_code[3]; psz_code[0] = i_code >> 8; psz_code[1] = i_code & 0xff; @@ -90,7 +90,7 @@ const iso639_lang_t * GetLang_1( const char * psz_code ) const iso639_lang_t * GetLang_2T( const char * psz_code ) { const iso639_lang_t *p_lang; - + for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ ) if( !strncmp( p_lang->psz_iso639_2T, psz_code, 3 ) ) return p_lang; diff --git a/src/video_output/video_text.h b/src/video_output/video_text.h index ee4ada7dd5..f37d730885 100644 --- a/src/video_output/video_text.h +++ b/src/video_output/video_text.h @@ -2,7 +2,7 @@ * video_text.h : text manipulation functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_text.h,v 1.8 2002/06/01 12:32:02 sam Exp $ + * $Id: video_text.h,v 1.9 2003/08/17 20:39:08 fenrir Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -41,5 +41,6 @@ void vout_TextSize ( vout_font_t *p_font, int i_style, int *pi_width, int *pi_height ); void vout_Print ( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int i_bytes_per_line, - u32, u32, u32, int, const char *, int ); + uint32_t, uint32_t, uint32_t, + int, const char *, int ); -- 2.20.1