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.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.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 3e5afe76d0..d636e35a2d 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -527,7 +527,7 @@ static av_always_inline void xchg_mb_border(H264Context *h, H264SliceContext *sl } } - if (h->deblocking_filter == 2) { + if (sl->deblocking_filter == 2) { deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == sl->slice_num; deblock_top = sl->top_type; } else { |