Merge commit 'bf07d813f6c88b5a76980f321cf7272d799c4216'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:02:17 +0000 (11:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:13:34 +0000 (11:13 +0100)
* commit 'bf07d813f6c88b5a76980f321cf7272d799c4216':
  libavutil: Add av_clip_intp2

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

Simple merge