Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:52:42 +0000 (22:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:52:58 +0000 (22:52 +0100)
commitbd8d73ea8bb726de2506a292e00200d486fe24ca
tree7e1c2c1ef3c263000687862ff5c2cfa72d4c90ac
parentd9574069c14a80944ae489b8a08876d123baa428
parentd59fcdaff36eb45307a29756c5dd1852034a3f3f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
libavutil/x86/cpu.c

See: 0bc3de19ffe296254f214dc7615e624d8e401bcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/cpu.c