提交 5a6a6cc7 编写于 作者: D Diego Biurrun

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

Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
上级 58170ffd
......@@ -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"
......
......@@ -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 ; i<q->num_vectors ; i++){
......
......@@ -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;
}
......
......@@ -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;
......
......@@ -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){
......
......@@ -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];
......
......@@ -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));
}
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册