diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-16 13:30:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-17 14:36:11 +0200 |
| commit | 060e1ad69d4d3e6b6c15de842a406ce310abd100 (patch) | |
| tree | 27644498d402f740eee2bcffe2e156dde117bb34 /libavcodec/hevc_mvs.c | |
| parent | 3300f5c133650ba25f94531d40ecc94c79b84457 (diff) | |
| download | ffmpeg-060e1ad69d4d3e6b6c15de842a406ce310abd100.tar.gz | |
avcodec/hevc_mvs: Cleanup ff_hevc_set_neighbour_available()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index fd0dbd9a56..1f6ca5a314 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -48,9 +48,9 @@ void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0, lc->na.cand_up = (lc->ctb_up_flag || y0b); lc->na.cand_left = (lc->ctb_left_flag || x0b); - lc->na.cand_up_left = (!x0b && !y0b) ? lc->ctb_up_left_flag : lc->na.cand_left && lc->na.cand_up; + lc->na.cand_up_left = (x0b || y0b) ? lc->na.cand_left && lc->na.cand_up : lc->ctb_up_left_flag; lc->na.cand_up_right_sap = - ((x0b + nPbW) == (1 << s->ps.sps->log2_ctb_size)) ? + (x0b + nPbW == 1 << s->ps.sps->log2_ctb_size) ? lc->ctb_up_right_flag && !y0b : lc->na.cand_up; lc->na.cand_up_right = lc->na.cand_up_right_sap |