Mercurial > libavcodec.hg
changeset 8955:e03f0d4f9e3d libavcodec
cosmetics: 'void/int inline' --> 'inline void/int' to avoid warnings of the type
"'inline' is not at beginning of declaration" with -Wextra.
| author | diego |
|---|---|
| date | Tue, 17 Feb 2009 12:11:46 +0000 |
| parents | 409d20e15da8 |
| children | de631175196e |
| files | h264.c vc1.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Tue Feb 17 12:03:10 2009 +0000 +++ b/h264.c Tue Feb 17 12:11:46 2009 +0000 @@ -6266,7 +6266,7 @@ } -static void av_always_inline filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int dir) { +static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int dir) { MpegEncContext * const s = &h->s; int edge; const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
--- a/vc1.c Tue Feb 17 12:03:10 2009 +0000 +++ b/vc1.c Tue Feb 17 12:11:46 2009 +0000 @@ -318,7 +318,7 @@ * @return whether other 3 pairs should be filtered or not * @see 8.6 */ -static int av_always_inline vc1_filter_line(uint8_t* src, int stride, int pq){ +static av_always_inline int vc1_filter_line(uint8_t* src, int stride, int pq){ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3;