Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:52:14 +0000 (16:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:52:49 +0000 (16:52 +0200)
* commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a':
  hevc: wait proper position for tmvp

Conflicts:
libavcodec/hevc_mvs.c

See: ed248e7f70d98abe099392e154d1cdd0f15faa3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge