summaryrefslogtreecommitdiff
path: root/libavcodec/h264_loopfilter.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-09-02 23:23:03 +0200
committerDiego Biurrun <diego@biurrun.de>2014-09-05 13:55:04 +0200
commit213e606752d16f51337e94431962fb5d7749c07e (patch)
tree0a952a63f2338533101fb978e585c2a4d6ede03d /libavcodec/h264_loopfilter.c
parent096a1d5b46391f65dfd0bee6292e9962f53bd7c8 (diff)
Replace av_unused attributes by block structures
This is more portable and avoids warnings with compilers that do not properly support av_unused.
Diffstat (limited to 'libavcodec/h264_loopfilter.c')
-rw-r--r--libavcodec/h264_loopfilter.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 717c22551b..a15130cb98 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -704,7 +704,6 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint
const int mb_type = h->cur_pic.mb_type[mb_xy];
const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
int first_vertical_edge_done = 0;
- av_unused int dir;
int chroma = !(CONFIG_GRAY && (h->flags&CODEC_FLAG_GRAY));
int qp_bd_offset = 6 * (h->sps.bit_depth_luma - 8);
int a = 52 + h->slice_alpha_c0_offset - qp_bd_offset;
@@ -815,8 +814,14 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint
}
#if CONFIG_SMALL
- for( dir = 0; dir < 2; dir++ )
- filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, dir ? 0 : first_vertical_edge_done, a, b, chroma, dir);
+ {
+ int dir;
+ for (dir = 0; dir < 2; dir++)
+ filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize,
+ uvlinesize, mb_xy, mb_type, mvy_limit,
+ dir ? 0 : first_vertical_edge_done, a, b,
+ chroma, dir);
+ }
#else
filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, first_vertical_edge_done, a, b, chroma, 0);
filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, 0, a, b, chroma, 1);