From 3f50965b28d0c4ef10dde0bf2f7a9f78fa36b378 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 19 Jan 2010 22:54:13 +0000 Subject: [PATCH] Mark the h264 c loop filter as av_always_inline av_flatten to make sure its all inlined, its small and horizontal & vertical versions are build out of them. no change as gcc already did this. Originally committed as revision 21333 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dsputil.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 25f501a6e1..6d1e8e55e0 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2975,7 +2975,7 @@ static void h261_loop_filter_c(uint8_t *src, int stride){ } } -static inline void h264_loop_filter_luma_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta, int8_t *tc0) +static av_always_inline av_flatten void h264_loop_filter_luma_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta, int8_t *tc0) { int i, d; for( i = 0; i < 4; i++ ) { @@ -3026,7 +3026,7 @@ static void h264_h_loop_filter_luma_c(uint8_t *pix, int stride, int alpha, int b h264_loop_filter_luma_c(pix, 1, stride, alpha, beta, tc0); } -static inline void h264_loop_filter_luma_intra_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta) +static av_always_inline av_flatten void h264_loop_filter_luma_intra_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta) { int d; for( d = 0; d < 16; d++ ) { @@ -3083,7 +3083,7 @@ static void h264_h_loop_filter_luma_intra_c(uint8_t *pix, int stride, int alpha, h264_loop_filter_luma_intra_c(pix, 1, stride, alpha, beta); } -static inline void h264_loop_filter_chroma_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta, int8_t *tc0) +static av_always_inline av_flatten void h264_loop_filter_chroma_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta, int8_t *tc0) { int i, d; for( i = 0; i < 4; i++ ) { @@ -3120,7 +3120,7 @@ static void h264_h_loop_filter_chroma_c(uint8_t *pix, int stride, int alpha, int h264_loop_filter_chroma_c(pix, 1, stride, alpha, beta, tc0); } -static inline void h264_loop_filter_chroma_intra_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta) +static av_always_inline av_flatten void h264_loop_filter_chroma_intra_c(uint8_t *pix, int xstride, int ystride, int alpha, int beta) { int d; for( d = 0; d < 8; d++ ) {