diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:59:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:59:20 +0100 |
| commit | 7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a (patch) | |
| tree | dd2396b97502947a1b8d12bee9918da828d895e9 /libavcodec/h264_loopfilter.c | |
| parent | ad6cee117e83711bf57e8dd90472543dbd61b8b8 (diff) | |
| parent | e6c90ce94f1b07f50cea2babf7471af455cca0ff (diff) | |
Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'
* commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff':
h264: move loopfilter parameters into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ba2dade7e3..e81751a204 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -251,8 +251,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]; @@ -725,8 +725,8 @@ void ff_h264_filter_mb(H264Context *h, H264SliceContext *sl, int first_vertical_edge_done = 0; int chroma = CHROMA(h) && !(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 |