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)
commit88d850ecb3ed32da84fdbbfa9d9b6097135b321f
tree67283c7feaaedd1f8a0d205e0588f1b11b435272
parent3fdcb8ccdc2cf5668e02134a815e5a7acc39f763
parentbf07d813f6c88b5a76980f321cf7272d799c4216
Merge commit 'bf07d813f6c88b5a76980f321cf7272d799c4216'

* commit 'bf07d813f6c88b5a76980f321cf7272d799c4216':
  libavutil: Add av_clip_intp2

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