Merge commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Oct 2014 10:29:07 +0000 (12:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Oct 2014 10:29:07 +0000 (12:29 +0200)
commit33c8500db4e25b7883e4655ba7db798542d05afc
treeefa5dfec69c67581183fa431993f3119dc0e6588
parent018ca8b7f6a8ff19edd7a79e01bea091dbc56fa9
parentd208d1eba3799c58fd6d3602d31de3e686f14aec
Merge commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec'

* commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec':
  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