mirror of https://git.ffmpeg.org/ffmpeg.git
9d01bf7d66
* 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> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| audio_convert.asm | ||
| audio_convert_init.c | ||
| audio_mix.asm | ||
| audio_mix_init.c | ||
| dither.asm | ||
| dither_init.c | ||
| util.asm | ||