Mercurial > libavcodec.hg
changeset 4908:777f250df232 libavcodec
Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
| author | diego |
|---|---|
| date | Sat, 05 May 2007 12:18:14 +0000 |
| parents | 2eac08efc196 |
| children | dee77a884d37 |
| files | cabac.h cook.c dca.c h264.c mpc.c mpegaudiodec.c shorten.c xan.c |
| diffstat | 8 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/cabac.h Sat May 05 11:14:03 2007 +0000 +++ b/cabac.h Sat May 05 12:18:14 2007 +0000 @@ -363,7 +363,7 @@ 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"
--- a/cook.c Sat May 05 11:14:03 2007 +0000 +++ b/cook.c Sat May 05 12:18:14 2007 +0000 @@ -496,7 +496,7 @@ * @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 ; i<q->num_vectors ; i++){
--- a/dca.c Sat May 05 11:14:03 2007 +0000 +++ b/dca.c Sat May 05 12:18:14 2007 +0000 @@ -87,7 +87,7 @@ /** 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; }
--- a/h264.c Sat May 05 11:14:03 2007 +0000 +++ b/h264.c Sat May 05 12:18:14 2007 +0000 @@ -3497,7 +3497,7 @@ } } -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 @@ 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 @@ 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;
--- a/mpc.c Sat May 05 11:14:03 2007 +0000 +++ b/mpc.c Sat May 05 12:18:14 2007 +0000 @@ -163,7 +163,7 @@ /** * 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){
--- a/mpegaudiodec.c Sat May 05 11:14:03 2007 +0000 +++ b/mpegaudiodec.c Sat May 05 12:18:14 2007 +0000 @@ -1729,7 +1729,7 @@ 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];
--- a/shorten.c Sat May 05 11:14:03 2007 +0000 +++ b/shorten.c Sat May 05 12:18:14 2007 +0000 @@ -172,12 +172,12 @@ 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)); }
--- a/xan.c Sat May 05 11:14:03 2007 +0000 +++ b/xan.c Sat May 05 12:18:14 2007 +0000 @@ -207,7 +207,7 @@ 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_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;