Merge commit '3187fa14a326908f9471a038e3b5b24c0eaf655e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:58:57 +0000 (16:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:59:27 +0000 (16:59 +0200)
commitb097d1765b38b39312935d01045b65bd79960317
tree6f03a3363d67891074e6f8cd64fb9fc1bc46c3c4
parent980aa2ae355d6dc93384d23440ea53c57254a08b
parent3187fa14a326908f9471a038e3b5b24c0eaf655e
Merge commit '3187fa14a326908f9471a038e3b5b24c0eaf655e'

* commit '3187fa14a326908f9471a038e3b5b24c0eaf655e':
  hevc_mvs: avoid deriving tmvp in amvp

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