From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 21 Feb 2015 10:15:18 +0000 (+0100)
Subject: Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'
X-Git-Tag: android-x86-6.0-r1~179
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee