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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 14:36:36 2013 +0200| [9d8e8495c9d733dd9004b26da9c73fddba7c14e5] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fdct: Only build fdct code if encoders have been enabled

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

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