Merge commit '09182b3224370e1d636631e77f201a8388766bd6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:06:33 +0000 (16:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:07:07 +0000 (16:07 +0200)
* commit '09182b3224370e1d636631e77f201a8388766bd6':
  hevc: simplify rounding

Conflicts:
libavcodec/hevc_mvs.c

See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevc_mvs.c

@@@ -241,10 -271,8 +241,10 @@@ static int temporal_luma_motion_vector(
          (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;
          y_pu               = y >> s->sps->log2_min_pu_size;
          temp_col           = TAB_MVF(x_pu, y_pu);
      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;
          y_pu               = y >> s->sps->log2_min_pu_size;
          temp_col           = TAB_MVF(x_pu, y_pu);