Merge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 21:48:00 +0000 (22:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 22:02:38 +0000 (23:02 +0100)
commit4d943cec68f31ff9cee7536ca699edc8de1eb74e
tree8f0860a672272116e8082e5a0e6f43d3b0f6336e
parent0c803eba2f56ce000ba2546124c246a71cb27266
parent982b596ea6640bfe218a31f6c3fc542d9fe61c31
Merge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'

* commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31':
  h264: avoid undefined behavior in chroma motion compensation

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