mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-16 13:51:37 +08:00

* qatar/master:
x86: add detection for Bit Manipulation Instruction sets
Conflicts:
libavutil/x86/cpu.c
See: 0bc3de19ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>