Skip to content

GitLab

Commit ac5c557f authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* ALL: changed __inline__ with inline (autoconf does the job for us anyway, 

    and mipspro doesn't know about __inline__).
parent feb33ac8
Hide whitespace changes
Inline Side-by-side
include/common.h
View file @ ac5c557f
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.106 2002/05/15 13:07:18 marcari Exp $
* $Id: common.h,v 1.107 2002/05/18 17:47:46 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -335,7 +335,7 @@ typedef struct iso639_lang_s iso639_lang_t;
#else
# define hton16 htons
# define hton32 htonl
static __inline__ u64 __hton64( u64 i )
static inline u64 __hton64( u64 i )
{
return ((u64)(htonl((i) & 0xffffffff)) << 32)
| htonl(((i) >> 32) & 0xffffffff );
......
include/input_ext-dec.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: input_ext-dec.h,v 1.57 2002/05/13 21:55:30 fenrir Exp $
* $Id: input_ext-dec.h,v 1.58 2002/05/18 17:47:46 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Kaempf <maxx@via.ecp.fr>
......@@ -239,7 +239,7 @@ void CurrentPTS( struct bit_stream_s *, mtime_t *, mtime_t * );
* on a word boundary (XXX: there must be at least sizeof(WORD_TYPE) - 1
* empty bytes in the bit buffer)
*****************************************************************************/
static __inline__ void AlignWord( bit_stream_t * p_bit_stream )
static inline void AlignWord( bit_stream_t * p_bit_stream )
{
while( (ptrdiff_t)p_bit_stream->p_byte
& (sizeof(WORD_TYPE) - 1) )
......@@ -265,8 +265,8 @@ static __inline__ void AlignWord( bit_stream_t * p_bit_stream )
/*****************************************************************************
* ShowBits : return i_bits bits from the bit stream
*****************************************************************************/
static __inline__ u32 ShowBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
static inline u32 ShowBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
{
if( p_bit_stream->fifo.i_available >= i_bits )
{
......@@ -288,8 +288,8 @@ static __inline__ u32 ShowBits( bit_stream_t * p_bit_stream,
* ShowSignedBits : return i_bits bits from the bit stream, using signed
* arithmetic
*****************************************************************************/
static __inline__ s32 ShowSignedBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
static inline s32 ShowSignedBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
{
if( p_bit_stream->fifo.i_available >= i_bits )
{
......@@ -306,8 +306,8 @@ static __inline__ s32 ShowSignedBits( bit_stream_t * p_bit_stream,
* RemoveBits : removes i_bits bits from the bit buffer
* XXX: do not use for 32 bits, see RemoveBits32
*****************************************************************************/
static __inline__ void RemoveBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
static inline void RemoveBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
{
p_bit_stream->fifo.i_available -= i_bits;
......@@ -334,7 +334,7 @@ static __inline__ void RemoveBits( bit_stream_t * p_bit_stream,
* refill it)
*****************************************************************************/
#if (WORD_TYPE == u32)
static __inline__ void RemoveBits32( bit_stream_t * p_bit_stream )
static inline void RemoveBits32( bit_stream_t * p_bit_stream )
{
if( p_bit_stream->p_byte <= p_bit_stream->p_end - sizeof(WORD_TYPE) )
{
......@@ -361,8 +361,8 @@ static __inline__ void RemoveBits32( bit_stream_t * p_bit_stream )
* GetBits : returns i_bits bits from the bit stream and removes them
* XXX: do not use for 32 bits, see GetBits32
*****************************************************************************/
static __inline__ u32 GetBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
static inline u32 GetBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
{
u32 i_result;
......@@ -398,8 +398,8 @@ static __inline__ u32 GetBits( bit_stream_t * p_bit_stream,
* using signed arithmetic
* XXX: do not use for 32 bits
*****************************************************************************/
static __inline__ s32 GetSignedBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
static inline s32 GetSignedBits( bit_stream_t * p_bit_stream,
unsigned int i_bits )
{
if( p_bit_stream->fifo.i_available >= i_bits )
{
......@@ -421,7 +421,7 @@ static __inline__ s32 GetSignedBits( bit_stream_t * p_bit_stream,
* GetBits32 : returns 32 bits from the bit stream and removes them
*****************************************************************************/
#if (WORD_TYPE == u32)
static __inline__ u32 GetBits32( bit_stream_t * p_bit_stream )
static inline u32 GetBits32( bit_stream_t * p_bit_stream )
{
u32 i_result;
......@@ -461,7 +461,7 @@ static __inline__ u32 GetBits32( bit_stream_t * p_bit_stream )
/*****************************************************************************
* RealignBits : realigns the bit buffer on an 8-bit boundary
*****************************************************************************/
static __inline__ void RealignBits( bit_stream_t * p_bit_stream )
static inline void RealignBits( bit_stream_t * p_bit_stream )
{
p_bit_stream->fifo.buffer <<= (p_bit_stream->fifo.i_available & 0x7);
p_bit_stream->fifo.i_available &= ~0x7;
......@@ -475,8 +475,8 @@ static __inline__ void RealignBits( bit_stream_t * p_bit_stream )
* RealignBits(). p_buffer must point to a buffer at least as big as i_buf_len
* otherwise your code will crash.
*****************************************************************************/
static __inline__ void GetChunk( bit_stream_t * p_bit_stream,
byte_t * p_buffer, size_t i_buf_len )
static inline void GetChunk( bit_stream_t * p_bit_stream,
byte_t * p_buffer, size_t i_buf_len )
{
ptrdiff_t i_available;
......
include/input_ext-plugins.h
View file @ ac5c557f
......@@ -3,7 +3,7 @@
* but exported to plug-ins
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: input_ext-plugins.h,v 1.27 2002/05/15 13:07:18 marcari Exp $
* $Id: input_ext-plugins.h,v 1.28 2002/05/18 17:47:46 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -145,8 +145,8 @@ void input_AccessEnd( struct input_thread_s * );
/*****************************************************************************
* Create a NULL packet for padding in case of a data loss
*****************************************************************************/
static __inline__ void input_NullPacket( input_thread_t * p_input,
es_descriptor_t * p_es )
static inline void input_NullPacket( input_thread_t * p_input,
es_descriptor_t * p_es )
{
data_packet_t * p_pad_data;
pes_packet_t * p_pes;
......
include/input_iovec.h
View file @ ac5c557f
......@@ -34,7 +34,7 @@ struct iovec
* readv_*: readv() replacements for iovec-impaired C libraries
*****************************************************************************/
#if defined( WIN32 )
static __inline__ int readv( int i_fd, struct iovec *p_iovec, int i_count )
static inline int readv( int i_fd, struct iovec *p_iovec, int i_count )
{
int i_index, i_len, i_total = 0;
unsigned char *p_base;
......
include/modules.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.49 2002/05/15 00:02:27 sam Exp $
* $Id: modules.h,v 1.50 2002/05/18 17:47:46 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -39,7 +39,7 @@ typedef void * module_handle_t;
/*****************************************************************************
* Module capabilities.
*****************************************************************************/
static __inline__ char *GetCapabilityName( unsigned int i_capa )
static inline char *GetCapabilityName( unsigned int i_capa )
{
/* The sole purpose of this inline function and the ugly #defines
* around it is to avoid having two places to modify when adding a
......
include/threads_funcs.h
View file @ ac5c557f
......@@ -3,7 +3,7 @@
* This header provides a portable threads implementation.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: threads_funcs.h,v 1.2 2002/04/29 23:57:38 massiot Exp $
* $Id: threads_funcs.h,v 1.3 2002/05/18 17:47:46 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -31,7 +31,7 @@
/*****************************************************************************
* vlc_threads_init: initialize threads system
*****************************************************************************/
static __inline__ int vlc_threads_init( void )
static inline int vlc_threads_init( void )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_init();
......@@ -57,7 +57,7 @@ static __inline__ int vlc_threads_init( void )
/*****************************************************************************
* vlc_threads_end: stop threads system
*****************************************************************************/
static __inline__ int vlc_threads_end( void )
static inline int vlc_threads_end( void )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_kill();
......@@ -83,7 +83,7 @@ static __inline__ int vlc_threads_end( void )
/*****************************************************************************
* vlc_mutex_init: initialize a mutex
*****************************************************************************/
static __inline__ int vlc_mutex_init( vlc_mutex_t *p_mutex )
static inline int vlc_mutex_init( vlc_mutex_t *p_mutex )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_mutex_init( p_mutex );
......@@ -165,8 +165,8 @@ static __inline__ int vlc_mutex_init( vlc_mutex_t *p_mutex )
_vlc_mutex_lock( "(unknown)", 0, P_MUTEX )
#endif
static __inline__ int _vlc_mutex_lock( char * psz_file, int i_line,
vlc_mutex_t *p_mutex )
static inline int _vlc_mutex_lock( char * psz_file, int i_line,
vlc_mutex_t *p_mutex )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_mutex_acquire( p_mutex, TRUE, NULL );
......@@ -228,8 +228,8 @@ static __inline__ int _vlc_mutex_lock( char * psz_file, int i_line,
_vlc_mutex_unlock( "(unknown)", 0, P_MUTEX )
#endif
static __inline__ int _vlc_mutex_unlock( char * psz_file, int i_line,
vlc_mutex_t *p_mutex )
static inline int _vlc_mutex_unlock( char * psz_file, int i_line,
vlc_mutex_t *p_mutex )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_mutex_release( p_mutex );
......@@ -289,8 +289,8 @@ static __inline__ int _vlc_mutex_unlock( char * psz_file, int i_line,
_vlc_mutex_destroy( "(unknown)", 0, P_MUTEX )
#endif
static __inline__ int _vlc_mutex_destroy( char * psz_file, int i_line,
vlc_mutex_t *p_mutex )
static inline int _vlc_mutex_destroy( char * psz_file, int i_line,
vlc_mutex_t *p_mutex )
{
#if defined( PTH_INIT_IN_PTH_H )
return 0;
......@@ -336,7 +336,7 @@ static __inline__ int _vlc_mutex_destroy( char * psz_file, int i_line,
/*****************************************************************************
* vlc_cond_init: initialize a condition
*****************************************************************************/
static __inline__ int vlc_cond_init( vlc_cond_t *p_condvar )
static inline int vlc_cond_init( vlc_cond_t *p_condvar )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_cond_init( p_condvar );
......@@ -390,7 +390,7 @@ static __inline__ int vlc_cond_init( vlc_cond_t *p_condvar )
/*****************************************************************************
* vlc_cond_signal: start a thread on condition completion
*****************************************************************************/
static __inline__ int vlc_cond_signal( vlc_cond_t *p_condvar )
static inline int vlc_cond_signal( vlc_cond_t *p_condvar )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_cond_notify( p_condvar, FALSE );
......@@ -463,7 +463,7 @@ static __inline__ int vlc_cond_signal( vlc_cond_t *p_condvar )
* Only works with pthreads, you need to adapt it for others
* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
*/
static __inline__ int vlc_cond_broadcast( vlc_cond_t *p_condvar )
static inline int vlc_cond_broadcast( vlc_cond_t *p_condvar )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_cond_notify( p_condvar, FALSE );
......@@ -543,9 +543,9 @@ static __inline__ int vlc_cond_broadcast( vlc_cond_t *p_condvar )
_vlc_cond_wait( "(unknown)", 0, P_COND, P_MUTEX )
#endif
static __inline__ int _vlc_cond_wait( char * psz_file, int i_line,
vlc_cond_t *p_condvar,
vlc_mutex_t *p_mutex )
static inline int _vlc_cond_wait( char * psz_file, int i_line,
vlc_cond_t *p_condvar,
vlc_mutex_t *p_mutex )
{
#if defined( PTH_INIT_IN_PTH_H )
return pth_cond_await( p_condvar, p_mutex, NULL );
......@@ -670,8 +670,8 @@ static __inline__ int _vlc_cond_wait( char * psz_file, int i_line,
_vlc_cond_destroy( "(unknown)", 0, P_COND )
#endif
static __inline__ int _vlc_cond_destroy( char * psz_file, int i_line,
vlc_cond_t *p_condvar )
static inline int _vlc_cond_destroy( char * psz_file, int i_line,
vlc_cond_t *p_condvar )
{
#if defined( PTH_INIT_IN_PTH_H )
return 0;
......@@ -707,11 +707,9 @@ static __inline__ int _vlc_cond_destroy( char * psz_file, int i_line,
#define vlc_thread_create( P_THREAD, PSZ_NAME, FUNC, P_DATA ) \
_vlc_thread_create( __FILE__, __LINE__, P_THREAD, PSZ_NAME, FUNC, P_DATA )
static __inline__ int _vlc_thread_create( char * psz_file, int i_line,
vlc_thread_t *p_thread,
char *psz_name,
vlc_thread_func_t func,
void *p_data )
static inline int _vlc_thread_create( char * psz_file, int i_line,
vlc_thread_t *p_thread, char *psz_name,
vlc_thread_func_t func, void *p_data )
{
int i_ret;
......@@ -792,7 +790,7 @@ static __inline__ int _vlc_thread_create( char * psz_file, int i_line,
/*****************************************************************************
* vlc_thread_exit: terminate a thread
*****************************************************************************/
static __inline__ void vlc_thread_exit( void )
static inline void vlc_thread_exit( void )
{
#if defined( PTH_INIT_IN_PTH_H )
pth_exit( 0 );
......@@ -830,8 +828,8 @@ static __inline__ void vlc_thread_exit( void )
_vlc_thread_join( "(unknown)", 0, THREAD )
#endif
static __inline__ void _vlc_thread_join( char * psz_file, int i_line,
vlc_thread_t thread )
static inline void _vlc_thread_join( char * psz_file, int i_line,
vlc_thread_t thread )
{
int i_ret = 0;
......
plugins/a52/a52.c
View file @ ac5c557f
......@@ -4,7 +4,7 @@
* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: a52.c,v 1.9 2002/05/01 19:59:42 gbazin Exp $
* $Id: a52.c,v 1.10 2002/05/18 17:47:46 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -58,7 +58,7 @@ static void EndThread ( a52_adec_thread_t * );
static void BitstreamCallback ( bit_stream_t *, boolean_t );
static void float2s16_2 ( float *, int16_t * );
static __inline__ int16_t convert ( int32_t );
static inline int16_t convert ( int32_t );
/*****************************************************************************
* Capabilities
......@@ -318,7 +318,7 @@ static void EndThread (a52_adec_thread_t *p_a52_adec)
* float2s16_2 : converts floats to ints using a trick based on the IEEE
* floating-point format
*****************************************************************************/
static __inline__ int16_t convert (int32_t i)
static inline int16_t convert (int32_t i)
{
if (i > 0x43c07fff)
return 32767;
......
plugins/ac3_adec/ac3_bit_allocate.c
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* ac3_bit_allocate.c: ac3 allocation tables
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: ac3_bit_allocate.c,v 1.6 2001/12/30 07:09:54 sam Exp $
* $Id: ac3_bit_allocate.c,v 1.7 2002/05/18 17:47:46 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -154,17 +154,17 @@ static const s16 baptab[] = { 0, 1, 1, 1, 1, 1, 2, 2, 3, 3, 3, 4, 4,
10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14,
14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15 };
static __inline__ u16 max_value (s16 a, s16 b)
static inline u16 max_value (s16 a, s16 b)
{
return (a > b ? a : b);
}
static __inline__ u16 min_value (s16 a, s16 b)
static inline u16 min_value (s16 a, s16 b)
{
return (a < b ? a : b);
}
static __inline__ s16 logadd (s16 a, s16 b)
static inline s16 logadd (s16 a, s16 b)
{
s16 c;
......@@ -175,7 +175,7 @@ static __inline__ s16 logadd (s16 a, s16 b)
}
}
static __inline__ s16 calc_lowcomp (s16 a, s16 b0, s16 b1, s16 bin)
static inline s16 calc_lowcomp (s16 a, s16 b0, s16 b1, s16 bin)
{
if (bin < 7) {
if ((b0 + 256) == b1)
......
plugins/ac3_adec/ac3_exponent.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* ac3_exponent.h: ac3 exponent calculations
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: ac3_exponent.h,v 1.1 2001/11/13 12:09:17 henri Exp $
* $Id: ac3_exponent.h,v 1.2 2002/05/18 17:47:46 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@zoy.org>
......@@ -57,9 +57,9 @@ static const s16 exps_3[128] =
#define UNPACK_CPL 2
#define UNPACK_LFE 4
static __inline__ int exp_unpack_ch (ac3dec_t * p_ac3dec, u16 type,
u16 expstr, u16 ngrps, u16 initial_exp,
u16 exps[], u16 * dest)
static inline int exp_unpack_ch (ac3dec_t * p_ac3dec, u16 type,
u16 expstr, u16 ngrps, u16 initial_exp,
u16 exps[], u16 * dest)
{
u16 i,j;
s16 exp_acc;
......
plugins/ac3_adec/ac3_mantissa.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* ac3_mantissa.h: ac3 mantissa computation
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ac3_mantissa.h,v 1.1 2001/11/13 12:09:17 henri Exp $
* $Id: ac3_mantissa.h,v 1.2 2002/05/18 17:47:46 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -233,7 +233,7 @@ static const u16 dither_lut[256] =
0x8bf4, 0x2be5, 0x6bc7, 0xcbd6, 0xeb83, 0x4b92, 0x0bb0, 0xaba1
};
static __inline__ u16 dither_gen (mantissa_t * p_mantissa)
static inline u16 dither_gen (mantissa_t * p_mantissa)
{
s16 state;
......@@ -245,8 +245,8 @@ static __inline__ u16 dither_gen (mantissa_t * p_mantissa)
/* Fetch an unpacked, left justified, and properly biased/dithered mantissa value */
static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithflag,
u16 exp)
static inline float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithflag,
u16 exp)
{
u16 group_code = 0;
......@@ -352,7 +352,7 @@ static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithf
}
/* Uncouple the coupling channel into a fbw channel */
static __inline__ void uncouple_channel (ac3dec_t * p_ac3dec, u32 ch)
static inline void uncouple_channel (ac3dec_t * p_ac3dec, u32 ch)
{
u32 bnd = 0;
u32 sub_bnd = 0;
......
plugins/ac3_adec/ac3_rematrix.c
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* ac3_rematrix.c: ac3 audio rematrixing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_rematrix.c,v 1.6 2001/12/30 07:09:54 sam Exp $
* $Id: ac3_rematrix.c,v 1.7 2002/05/18 17:47:46 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -41,7 +41,7 @@ struct rematrix_band_s {
static const struct rematrix_band_s rematrix_band[] = { {13,24}, {25,36}, {37 ,60}, {61,252}};
static __inline__ u32 min_value (u32 a, u32 b)
static inline u32 min_value (u32 a, u32 b)
{
return (a < b ? a : b);
}
......
plugins/avi/avi.c
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.18 2002/05/17 15:47:01 fenrir Exp $
* $Id: avi.c,v 1.19 2002/05/18 17:47:46 sam Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -187,7 +187,7 @@ int avi_ParseWaveFormatEx( waveformatex_t *h, byte_t *p_data )
return( 0 );
}
static __inline__ int __AVIGetESTypeFromTwoCC( u16 i_type )
static inline int __AVIGetESTypeFromTwoCC( u16 i_type )
{
switch( i_type )
{
......@@ -1193,8 +1193,8 @@ static pes_packet_t *__AVI_ReadStreamBytesInPES( input_thread_t *p_input,
* Function to convert pts to chunk or byte
*****************************************************************************/
static __inline__ mtime_t __AVI_PTSToChunk( AVIStreamInfo_t *p_info,
mtime_t i_pts )
static inline mtime_t __AVI_PTSToChunk( AVIStreamInfo_t *p_info,
mtime_t i_pts )
{
return( (mtime_t)((double)i_pts *
(double)p_info->header.i_rate /
......@@ -1202,8 +1202,8 @@ static __inline__ mtime_t __AVI_PTSToChunk( AVIStreamInfo_t *p_info,
(double)1000000.0 ) );
}
static __inline__ mtime_t __AVI_PTSToByte( AVIStreamInfo_t *p_info,
mtime_t i_pts )
static inline mtime_t __AVI_PTSToByte( AVIStreamInfo_t *p_info,
mtime_t i_pts )
{
return( (mtime_t)((double)i_pts *
(double)p_info->header.i_samplesize *
......@@ -1420,9 +1420,9 @@ static pes_packet_t *AVI_GetFrameInPES( input_thread_t *p_input,
*****************************************************************************
* Handle multiple pes, and set pts to the good value
*****************************************************************************/
static __inline__ void AVI_DecodePES( input_thread_t *p_input,
AVIStreamInfo_t *p_info,
pes_packet_t *p_pes )
static inline void AVI_DecodePES( input_thread_t *p_input,
AVIStreamInfo_t *p_info,
pes_packet_t *p_pes )
{
pes_packet_t *p_pes_next;
/* input_decode want only one pes, but AVI_GetFrameInPES give
......
plugins/ffmpeg/ffmpeg.c
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.9 2002/05/13 21:55:30 fenrir Exp $
* $Id: ffmpeg.c,v 1.10 2002/05/18 17:47:46 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -94,14 +94,14 @@ MODULE_DEACTIVATE_START
MODULE_DEACTIVATE_STOP
static __inline__ u16 __GetWordLittleEndianFromBuff( byte_t *p_buff )
static inline u16 __GetWordLittleEndianFromBuff( byte_t *p_buff )
{
u16 i;
i = (*p_buff) + ( *(p_buff + 1) <<8 );
return ( i );
}
static __inline__ u32 __GetDoubleWordLittleEndianFromBuff( byte_t *p_buff )
static inline u32 __GetDoubleWordLittleEndianFromBuff( byte_t *p_buff )
{
u32 i;
i = (*p_buff) + ( *(p_buff + 1) <<8 ) +
......@@ -199,7 +199,7 @@ static void __PES_NEXT( decoder_fifo_t *p_fifo )
vlc_mutex_unlock( &p_fifo->data_lock );
}
static __inline__ void __GetFrame( videodec_thread_t *p_vdec )
static inline void __GetFrame( videodec_thread_t *p_vdec )
{
pes_packet_t *p_pes;
data_packet_t *p_data;
......@@ -232,7 +232,7 @@ static __inline__ void __GetFrame( videodec_thread_t *p_vdec )
} while( p_data );
}
static __inline__ void __NextFrame( videodec_thread_t *p_vdec )
static inline void __NextFrame( videodec_thread_t *p_vdec )
{
pes_packet_t *p_pes;
......
plugins/gtk/gtk_common.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* gtk_common.h: private Gtk+ interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: gtk_common.h,v 1.7 2002/03/25 20:37:00 lool Exp $
* $Id: gtk_common.h,v 1.8 2002/05/18 17:47:46 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -33,7 +33,7 @@
/*****************************************************************************
* Useful inline function
****************************************************************************/
static __inline__ intf_thread_t * GetIntf( GtkWidget *item, char * psz_parent )
static inline intf_thread_t * GetIntf( GtkWidget *item, char * psz_parent )
{
return( gtk_object_get_data( GTK_OBJECT( lookup_widget(item, psz_parent) ),
"p_intf" ) );
......
plugins/idct/block_c.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* block_c.h: Macroblock copy functions in C
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: block_c.h,v 1.1 2001/09/05 16:07:49 massiot Exp $
* $Id: block_c.h,v 1.2 2002/05/18 17:47:46 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -58,8 +58,8 @@ static void InitBlock ( )
/*****************************************************************************
* AddBlock: add a block
*****************************************************************************/
static __inline__ void AddBlock( dctelem_t * p_block, yuv_data_t * p_data,
int i_incr )
static inline void AddBlock( dctelem_t * p_block, yuv_data_t * p_data,
int i_incr )
{
int i = 8;
......@@ -81,8 +81,8 @@ static __inline__ void AddBlock( dctelem_t * p_block, yuv_data_t * p_data,
/*****************************************************************************
* CopyBlock: copy a block
*****************************************************************************/
static __inline__ void CopyBlock( dctelem_t * p_block, yuv_data_t * p_data,
int i_incr )
static inline void CopyBlock( dctelem_t * p_block, yuv_data_t * p_data,
int i_incr )
{
int i = 8;
......
plugins/idct/block_mmx.h
View file @ ac5c557f
......@@ -2,7 +2,7 @@
* block_mmx.h: Macroblock copy functions in MMX assembly
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: block_mmx.h,v 1.1 2001/09/05 16:07:49 massiot Exp $
* $Id: block_mmx.h,v 1.2 2002/05/18 17:47:46 sam Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
* Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
......@@ -25,7 +25,7 @@
/*****************************************************************************
* InitBlock: placeholder because we don't need a crop table, MMX does it for us
*****************************************************************************/
static __inline__ void InitBlock( )
static inline void InitBlock( )
{
;
}
......@@ -44,8 +44,8 @@ static __inline__ void InitBlock( )
punpckhbw_r2r (mm0, r2); \