Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:37:18 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:37:22 +0000 (11:37 +0200)
commit3f965ab95d94ee39c70b4711a8680f41575996c1
treed778556a0c84e460b07d3204bc318e36e6ac2a59
parent1f17619fe4800dce32a81fda0cec9afad91ff095
parent47f9d7ce5493e119e09d1227d017414feaaf8d97
Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/x86inc.asm