Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:15:18 +0000 (11:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:15:32 +0000 (11:15 +0100)
commit1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee
tree0b51bc4436d4b4a5cca1e58210b8edd598afd83f
parent88d850ecb3ed32da84fdbbfa9d9b6097135b321f
parent76ce9bd8e26dcb3652240a1072840ff4011d7cdc
Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'

* commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc':
  libavutil: Add ARM av_clip_intp2_arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/arm/intmath.h