Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/hevc_mvs.c | 4 ++--
1 file 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
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
