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_mb_template.c | |
| parent | ad6cee117e83711bf57e8dd90472543dbd61b8b8 (diff) | |
| parent | e6c90ce94f1b07f50cea2babf7471af455cca0ff (diff) | |
| download | ffmpeg-7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a.tar.gz | |
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_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index b7f4a059b2..a9671ae265 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -155,7 +155,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) } } else { if (IS_INTRA(mb_type)) { - if (h->deblocking_filter) + if (sl->deblocking_filter) xchg_mb_border(h, sl, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT); @@ -168,7 +168,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) transform_bypass, PIXEL_SHIFT, block_offset, linesize, dest_y, 0); - if (h->deblocking_filter) + if (sl->deblocking_filter) xchg_mb_border(h, sl, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, 0, SIMPLE, PIXEL_SHIFT); } else if (is_h264) { @@ -339,7 +339,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext } } else { if (IS_INTRA(mb_type)) { - if (h->deblocking_filter) + if (sl->deblocking_filter) xchg_mb_border(h, sl, dest[0], dest[1], dest[2], linesize, linesize, 1, 1, SIMPLE, PIXEL_SHIFT); @@ -348,7 +348,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext transform_bypass, PIXEL_SHIFT, block_offset, linesize, dest[p], p); - if (h->deblocking_filter) + if (sl->deblocking_filter) xchg_mb_border(h, sl, dest[0], dest[1], dest[2], linesize, linesize, 0, 1, SIMPLE, PIXEL_SHIFT); } else { |