Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix multiple "‘inline/static’ is not at beginning of declaration" warnings.

Browse Source 
Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 18 years ago
parent 58170ffdf7
commit 5a6a6cc7dc
8 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/cabac.h
  2. 2
      libavcodec/cook.c
  3. 2
      libavcodec/dca.c
  4. 6
      libavcodec/h264.c
  5. 2
      libavcodec/mpc.c
  6. 2
      libavcodec/mpegaudiodec.c
  7. 4
      libavcodec/shorten.c
  8. 4
      libavcodec/xan.c

2
libavcodec/cabac.h
Unescape View File

@ -363,7 +363,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){
refill(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 //FIXME gcc generates duplicate load/stores for c->low and c->range
#define LOW "0" #define LOW "0"
#define RANGE "4" #define RANGE "4"

2
libavcodec/cook.c
Unescape View File

@ -496,7 +496,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
* @param category_index pointer to the category_index array * @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* category_index){
int i; int i;
for(i=0 ; i<q->num_vectors ; i++){ for(i=0 ; i<q->num_vectors ; i++){

2
libavcodec/dca.c
Unescape View File

@ -87,7 +87,7 @@ static BitAlloc dca_smpl_bitalloc[11]; ///< samples VLCs
/** Pre-calculated cosine modulation coefs for the QMF */ /** Pre-calculated cosine modulation coefs for the QMF */
static float cos_mod[544]; 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; return get_vlc2(gb, ba->vlc[idx].table, ba->vlc[idx].bits, ba->wrap) + ba->offset;
} }

6
libavcodec/h264.c
Unescape View File

@ -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; MpegEncContext * const s = &h->s;
const int mb_x= s->mb_x; const int mb_x= s->mb_x;
const int mb_y= s->mb_y; 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 ); 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 nza, nzb;
int ctx = 0; int ctx = 0;
@ -6185,7 +6185,7 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
return 0; return 0;
} }
static void inline compute_mb_neighbors(H264Context *h) static inline void compute_mb_neighbors(H264Context *h)
{ {
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;

2
libavcodec/mpc.c
Unescape View File

@ -163,7 +163,7 @@ static void mpc_synth(MPCContext *c, int16_t *out)
/** /**
* Fill samples for given subband * 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; int i, i1, t;
switch(idx){ switch(idx){

2
libavcodec/mpegaudiodec.c
Unescape View File

@ -1729,7 +1729,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
g->sb_hybrid[s_index+2]= g->sb_hybrid[s_index+2]=
g->sb_hybrid[s_index+3]= 0; g->sb_hybrid[s_index+3]= 0;
while(code){ 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 v;
int pos= s_index+idxtab[code]; int pos= s_index+idxtab[code];
code ^= 8>>idxtab[code]; code ^= 8>>idxtab[code];

4
libavcodec/shorten.c
Unescape View File

@ -172,12 +172,12 @@ static void init_offset(ShortenContext *s)
s->offset[chan][i] = mean; 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)); 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)); return bswap_16(get_bits_long(gb, 16));
} }

4
libavcodec/xan.c
Unescape View File

@ -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; 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) unsigned char *pixel_buffer, int x, int y, int pixel_count)
{ {
int stride; 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 x, int y, int pixel_count, int motion_x, int motion_y)
{ {
int stride; int stride;

Write Preview
Loading…
Cancel
Save