From de86157836aa8b2616d9fd9f56a1c1e55ff632df Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 17 Feb 2009 12:11:46 +0000 Subject: [PATCH] cosmetics: 'void/int inline' --> 'inline void/int' to avoid warnings of the type "'inline' is not at beginning of declaration" with -Wextra. Originally committed as revision 17392 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 2 +- libavcodec/vc1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 285f9c9569..c1e3cfaff3 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6266,7 +6266,7 @@ static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, } -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; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 199dc68887..cda1f420cc 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -318,7 +318,7 @@ static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v) * @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;