[FFmpeg-cvslog] Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 23 22:25:08 2014 +0100| [38336f0fb10a0a1dbcbbf371d0ab90520cee29c0] | committer: Michael Niedermayer

Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'

* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

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

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