diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:59:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:18:10 +0100 |
| commit | cc2cfdc49786a8268d1514661c17ea96035d6f1d (patch) | |
| tree | fd17d2f29472b84fce724d66fc982ee51f7cd42f /libavcodec/h264_loopfilter.c | |
| parent | 27b3522ba3cf539e13bb0f8f9c68d2dd513a8f73 (diff) | |
| parent | 95eb35f30513e335990ad0d5dca6ddc318477291 (diff) | |
| download | ffmpeg-cc2cfdc49786a8268d1514661c17ea96035d6f1d.tar.gz | |
Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'
* commit '95eb35f30513e335990ad0d5dca6ddc318477291':
h264: move the ref lists variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_loopfilter.c')
| -rw-r--r-- | libavcodec/h264_loopfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 74ff0c97fb..dc4d771d1a 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -370,7 +370,7 @@ static av_always_inline void h264_filter_mb_fast_internal(H264Context *h, int step = 1+(mb_type>>24); //IS_8x8DCT(mb_type) ? 2 : 1; edges = 4 - 3*((mb_type>>3) & !(h->cbp & 15)); //(mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4; h->h264dsp.h264_loop_filter_strength(bS, sl->non_zero_count_cache, sl->ref_cache, sl->mv_cache, - h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE(h)); + sl->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE(h)); } if( IS_INTRA(left_type) ) AV_WN64A(bS[0][0], 0x0004000400040004ULL); @@ -445,7 +445,7 @@ static int check_mv(H264Context *h, H264SliceContext *sl, long b_idx, long bn_id v = sl->mv_cache[0][b_idx][0] - sl->mv_cache[0][bn_idx][0] + 3 >= 7U | FFABS(sl->mv_cache[0][b_idx][1] - sl->mv_cache[0][bn_idx][1]) >= mvy_limit; - if(h->list_count==2){ + if (sl->list_count == 2) { if(!v) v = sl->ref_cache[1][b_idx] != sl->ref_cache[1][bn_idx] | sl->mv_cache[1][b_idx][0] - sl->mv_cache[1][bn_idx][0] + 3 >= 7U | |