Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:39:20 +0000 (16:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:39:58 +0000 (16:39 +0200)
* commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c':
  hevc: use intreadwrite

Conflicts:
libavcodec/hevc_mvs.c

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

@@@ -461,9 -526,11 +461,9 @@@ static void derive_spatial_merge_candid
  
      // append Zero motion vector candidates
      while (nb_merge_cand < s->sh.max_num_merge_cand) {
 -        mergecandlist[nb_merge_cand].pred_flag[0] = 1;
 -        mergecandlist[nb_merge_cand].pred_flag[1] = s->sh.slice_type == B_SLICE;
 +        mergecandlist[nb_merge_cand].pred_flag    = PF_L0 + ((s->sh.slice_type == B_SLICE) << 1);
-         AV_ZERO32(mergecandlist[nb_merge_cand].mv+0);
-         AV_ZERO32(mergecandlist[nb_merge_cand].mv+1);
+         AV_ZERO32(mergecandlist[nb_merge_cand].mv + 0);
+         AV_ZERO32(mergecandlist[nb_merge_cand].mv + 1);
 -        mergecandlist[nb_merge_cand].is_intra     = 0;
          mergecandlist[nb_merge_cand].ref_idx[0]   = zero_idx < nb_refs ? zero_idx : 0;
          mergecandlist[nb_merge_cand].ref_idx[1]   = zero_idx < nb_refs ? zero_idx : 0;