Mercurial > libavcodec.hg
comparison h264.c @ 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 | b1fd0281c139 |
children | 0d1cc37d9430 |
comparison
equal
deleted
inserted
replaced
4907:2eac08efc196 | 4908:777f250df232 |
---|---|
3495 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1); | 3495 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1); |
3496 } | 3496 } |
3497 } | 3497 } |
3498 } | 3498 } |
3499 | 3499 |
3500 static void av_always_inline hl_decode_mb_internal(H264Context *h, int simple){ | 3500 static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ |
3501 MpegEncContext * const s = &h->s; | 3501 MpegEncContext * const s = &h->s; |
3502 const int mb_x= s->mb_x; | 3502 const int mb_x= s->mb_x; |
3503 const int mb_y= s->mb_y; | 3503 const int mb_y= s->mb_y; |
3504 const int mb_xy= mb_x + mb_y*s->mb_stride; | 3504 const int mb_xy= mb_x + mb_y*s->mb_stride; |
3505 const int mb_type= s->current_picture.mb_type[mb_xy]; | 3505 const int mb_type= s->current_picture.mb_type[mb_xy]; |
5974 } | 5974 } |
5975 } | 5975 } |
5976 return get_cabac_bypass_sign( &h->cabac, -mvd ); | 5976 return get_cabac_bypass_sign( &h->cabac, -mvd ); |
5977 } | 5977 } |
5978 | 5978 |
5979 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { | 5979 static inline int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
5980 int nza, nzb; | 5980 int nza, nzb; |
5981 int ctx = 0; | 5981 int ctx = 0; |
5982 | 5982 |
5983 if( cat == 0 ) { | 5983 if( cat == 0 ) { |
5984 nza = h->left_cbp&0x100; | 5984 nza = h->left_cbp&0x100; |
6183 h->cabac.bytestream= cc.bytestream; | 6183 h->cabac.bytestream= cc.bytestream; |
6184 #endif | 6184 #endif |
6185 return 0; | 6185 return 0; |
6186 } | 6186 } |
6187 | 6187 |
6188 static void inline compute_mb_neighbors(H264Context *h) | 6188 static inline void compute_mb_neighbors(H264Context *h) |
6189 { | 6189 { |
6190 MpegEncContext * const s = &h->s; | 6190 MpegEncContext * const s = &h->s; |
6191 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | 6191 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
6192 h->top_mb_xy = mb_xy - s->mb_stride; | 6192 h->top_mb_xy = mb_xy - s->mb_stride; |
6193 h->left_mb_xy[0] = mb_xy - 1; | 6193 h->left_mb_xy[0] = mb_xy - 1; |