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)
* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
libavutil/x86/cpu.c

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

Simple merge