diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | e6c90ce94f1b07f50cea2babf7471af455cca0ff (patch) | |
| tree | 90a6a210485a743e4d59de27b7094a3d861c8546 /libavcodec/h264_loopfilter.c | |
| parent | bd3e460b73dd54a68dc253e010c239cefc8d8d55 (diff) | |
| download | ffmpeg-e6c90ce94f1b07f50cea2babf7471af455cca0ff.tar.gz | |
h264: move loopfilter parameters into the per-slice context
Diffstat (limited to 'libavcodec/h264_loopfilter.c')
| -rw-r--r-- | libavcodec/h264_loopfilter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index c58d3f1728..e62657c8a1 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -253,8 +253,8 @@ static av_always_inline void h264_filter_mb_fast_internal(H264Context *h, int top_type = sl->top_type; int qp_bd_offset = 6 * (h->sps.bit_depth_luma - 8); - int a = 52 + h->slice_alpha_c0_offset - qp_bd_offset; - int b = 52 + h->slice_beta_offset - qp_bd_offset; + int a = 52 + sl->slice_alpha_c0_offset - qp_bd_offset; + int b = 52 + sl->slice_beta_offset - qp_bd_offset; int mb_type = h->cur_pic.mb_type[mb_xy]; int qp = h->cur_pic.qscale_table[mb_xy]; @@ -723,8 +723,8 @@ void ff_h264_filter_mb(H264Context *h, H264SliceContext *sl, int first_vertical_edge_done = 0; 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; - int b = 52 + h->slice_beta_offset - qp_bd_offset; + int a = 52 + sl->slice_alpha_c0_offset - qp_bd_offset; + int b = 52 + sl->slice_beta_offset - qp_bd_offset; if (FRAME_MBAFF(h) // and current and left pair do not have the same interlaced type |