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)
* commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc':
  libavutil: Add ARM av_clip_intp2_arm

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

Simple merge