[FFmpeg-cvslog] Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  8 11:37:18 2013 +0200| [3f965ab95d94ee39c70b4711a8680f41575996c1] | committer: Michael Niedermayer

Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'

* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97':
  x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"

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

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