From 5a6a6cc7dc5adc376c4ff082218d055d67bf3175 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 5 May 2007 12:18:14 +0000 Subject: [PATCH] =?utf8?q?Fix=20multiple=20"=E2=80=98inline/static?= =?utf8?q?=E2=80=99=20is=20not=20at=20beginning=20of=20declaration"=20warn?= =?utf8?q?ings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/cabac.h | 2 +- libavcodec/cook.c | 2 +- libavcodec/dca.c | 2 +- libavcodec/h264.c | 6 +++--- libavcodec/mpc.c | 2 +- libavcodec/mpegaudiodec.c | 2 +- libavcodec/shorten.c | 4 ++-- libavcodec/xan.c | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 0f83d7c0f..3ef7f438a 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -363,7 +363,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ refill(c); } -static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const state){ +static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const state){ //FIXME gcc generates duplicate load/stores for c->low and c->range #define LOW "0" #define RANGE "4" diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 291d1144c..cdbddea4f 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -496,7 +496,7 @@ static void categorize(COOKContext *q, int* quant_index_table, * @param category_index pointer to the category_index array */ -static void inline expand_category(COOKContext *q, int* category, +static inline void expand_category(COOKContext *q, int* category, int* category_index){ int i; for(i=0 ; inum_vectors ; i++){ diff --git a/libavcodec/dca.c b/libavcodec/dca.c index c3ade2f04..3a71aca3a 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -87,7 +87,7 @@ static BitAlloc dca_smpl_bitalloc[11]; ///< samples VLCs /** Pre-calculated cosine modulation coefs for the QMF */ static float cos_mod[544]; -static int av_always_inline get_bitalloc(GetBitContext *gb, BitAlloc *ba, int idx) +static av_always_inline int get_bitalloc(GetBitContext *gb, BitAlloc *ba, int idx) { return get_vlc2(gb, ba->vlc[idx].table, ba->vlc[idx].bits, ba->wrap) + ba->offset; } diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f8f61d374..3c0df98ab 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3497,7 +3497,7 @@ b= t; } } -static void av_always_inline hl_decode_mb_internal(H264Context *h, int simple){ +static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ MpegEncContext * const s = &h->s; const int mb_x= s->mb_x; const int mb_y= s->mb_y; @@ -5976,7 +5976,7 @@ static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) { return get_cabac_bypass_sign( &h->cabac, -mvd ); } -static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { +static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { int nza, nzb; int ctx = 0; @@ -6185,7 +6185,7 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n return 0; } -static void inline compute_mb_neighbors(H264Context *h) +static inline void compute_mb_neighbors(H264Context *h) { MpegEncContext * const s = &h->s; const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c index f351c549f..400cfee89 100644 --- a/libavcodec/mpc.c +++ b/libavcodec/mpc.c @@ -163,7 +163,7 @@ static void mpc_synth(MPCContext *c, int16_t *out) /** * Fill samples for given subband */ -static void inline idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *dst) +static inline void idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *dst) { int i, i1, t; switch(idx){ diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 78f4ac0e2..3701b0dec 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1729,7 +1729,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, g->sb_hybrid[s_index+2]= g->sb_hybrid[s_index+3]= 0; while(code){ - const static int idxtab[16]={3,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0}; + static const int idxtab[16]={3,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0}; int v; int pos= s_index+idxtab[code]; code ^= 8>>idxtab[code]; diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index efb48b51d..cfea5bc38 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -172,12 +172,12 @@ static void init_offset(ShortenContext *s) s->offset[chan][i] = mean; } -static int inline get_le32(GetBitContext *gb) +static inline int get_le32(GetBitContext *gb) { return bswap_32(get_bits_long(gb, 32)); } -static short inline get_le16(GetBitContext *gb) +static inline short get_le16(GetBitContext *gb) { return bswap_16(get_bits_long(gb, 16)); } diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 49bb981bf..c0e2db784 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -207,7 +207,7 @@ static void xan_unpack(unsigned char *dest, unsigned char *src, int dest_len) bytecopy(dest, src, size); dest += size; src += size; } -static void inline xan_wc3_output_pixel_run(XanContext *s, +static inline void xan_wc3_output_pixel_run(XanContext *s, unsigned char *pixel_buffer, int x, int y, int pixel_count) { int stride; @@ -236,7 +236,7 @@ static void inline xan_wc3_output_pixel_run(XanContext *s, } } -static void inline xan_wc3_copy_pixel_run(XanContext *s, +static inline void xan_wc3_copy_pixel_run(XanContext *s, int x, int y, int pixel_count, int motion_x, int motion_y) { int stride; -- 2.11.0