[FFmpeg-cvslog] Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 14:36:04 2014 +0100| [9ace154186d853f56f9e713c2fd67f92c851ec04] | committer: Michael Niedermayer

Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'

* commit '99e20125232d40ea239a5b54d26bbfe526506114':
  x86/arm: Add clobber tests to libavresample

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ace154186d853f56f9e713c2fd67f92c851ec04
---