diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:06:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:07:07 +0200 |
| commit | e6ffe7bcfc4a559624fdb543612d9ec839891793 (patch) | |
| tree | aaae22c7f9a6167872c54463b2add23b928d2faa | |
| parent | 2278146a0ca06ab88cc4885f9f7b1d56eff9873f (diff) | |
| parent | 09182b3224370e1d636631e77f201a8388766bd6 (diff) | |
| download | ffmpeg-e6ffe7bcfc4a559624fdb543612d9ec839891793.tar.gz | |
Merge commit '09182b3224370e1d636631e77f201a8388766bd6'
* commit '09182b3224370e1d636631e77f201a8388766bd6':
hevc: simplify rounding
Conflicts:
libavcodec/hevc_mvs.c
See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc_mvs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 3d8276fa8c..4bec9f981d 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -241,8 +241,8 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0, (y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) && y < s->sps->height && x < s->sps->width) { - x &= -16; - y &= -16; + x &= ~15; + y &= ~15; if (s->threads_type == FF_THREAD_FRAME) ff_thread_await_progress(&ref->tf, y, 0); x_pu = x >> s->sps->log2_min_pu_size; @@ -255,8 +255,8 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0, if (tab_mvf && !availableFlagLXCol) { x = x0 + (nPbW >> 1); y = y0 + (nPbH >> 1); - x &= -16; - y &= -16; + x &= ~15; + y &= ~15; if (s->threads_type == FF_THREAD_FRAME) ff_thread_await_progress(&ref->tf, y, 0); x_pu = x >> s->sps->log2_min_pu_size; |