[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 13 11:36:42 2013 +0200| [df4f4fc8a50b4afe9a8d4b5f72c8638b6722888e] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: x86: Only enable cpunop on i686

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

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