Michael Niedermayer 9d01bf7d66 Merge remote-tracking branch 'qatar/master' ... * 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>		2013-07-18 09:53:47 +02:00
..
audio_convert_init.c	Consistently use "cpu_flags" as variable/parameter name for CPU flags	2013-07-18 00:31:35 +02:00
audio_convert.asm	build: Drop AVX assembly ifdefs	2012-11-11 20:43:28 +01:00
audio_mix_init.c	Consistently use "cpu_flags" as variable/parameter name for CPU flags	2013-07-18 00:31:35 +02:00
audio_mix.asm	Merge remote-tracking branch 'qatar/master'	2013-01-06 13:20:23 +01:00
dither_init.c	Merge remote-tracking branch 'qatar/master'	2013-07-18 09:53:47 +02:00
dither.asm	Merge remote-tracking branch 'qatar/master'	2013-01-09 12:30:14 +01:00
Makefile	x86: lavr: add SSE2 quantize() for dithering	2013-01-08 14:52:43 -05:00
util.asm	lavr: x86: optimized 2-channel s16 to s16p conversion	2012-08-23 20:10:57 -04:00