mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-17 03:53:28 +00:00
* qatar/master: Consistently use "cpu_flags" as variable/parameter name for CPU flags Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideo.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
asm.h | ||
bswap.h | ||
cpu.c | ||
cpu.h | ||
cpuid.asm | ||
emms.asm | ||
emms.h | ||
float_dsp_init.c | ||
float_dsp.asm | ||
intreadwrite.h | ||
lls_init.c | ||
lls.asm | ||
Makefile | ||
timer.h | ||
w64xmmtest.h | ||
x86inc.asm | ||
x86util.asm |