diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:39:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:39:58 +0200 |
| commit | 17cbc6457b7a0c38fececc3e0ecff99cc8c96526 (patch) | |
| tree | 6f03a3363d67891074e6f8cd64fb9fc1bc46c3c4 /libavcodec | |
| parent | 5195512addc1f6bced2e33b8faf77abb5b8703b6 (diff) | |
| parent | cf6090dc6252f2b276aa4133e3d73a89f4c6046c (diff) | |
| download | ffmpeg-17cbc6457b7a0c38fececc3e0ecff99cc8c96526.tar.gz | |
Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'
* commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c':
hevc: use intreadwrite
Conflicts:
libavcodec/hevc_mvs.c
See: 7a4a5515b0ce97f1c4e18ed012cc3f86328dd220
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 8df4915ca4..fffae8882e 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -462,8 +462,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, // append Zero motion vector candidates while (nb_merge_cand < s->sh.max_num_merge_cand) { 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].ref_idx[0] = zero_idx < nb_refs ? zero_idx : 0; mergecandlist[nb_merge_cand].ref_idx[1] = zero_idx < nb_refs ? zero_idx : 0; |