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_mb_template.c | |
| parent | bd3e460b73dd54a68dc253e010c239cefc8d8d55 (diff) | |
| download | ffmpeg-e6c90ce94f1b07f50cea2babf7471af455cca0ff.tar.gz | |
h264: move loopfilter parameters into the per-slice context
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 558a9b5de4..8b907b4637 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -158,7 +158,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); @@ -171,7 +171,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) { @@ -342,7 +342,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); @@ -351,7 +351,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 { |