Merge commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Nov 2014 12:06:25 +0000 (13:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Nov 2014 12:06:25 +0000 (13:06 +0100)
commit0ddcee172ec8a8abc91c61c3a66bbfd432373976
tree1e4db2cfc0356f93d88fa9858a5d49618f4a2435
parent13ecdb06f8503c852546b017e7e861e10d9f416f
parent0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b
Merge commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b' into release/2.4

* commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b':
  hevc_mvs: make sure to always initialize the temporal MV fully

Conflicts:
libavcodec/hevc_mvs.c

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