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)
* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97':
  x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"

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

Simple merge