Merge commit 'd68c05380cebf563915412182643a8be04ef890b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:22:23 +0000 (00:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:22:47 +0000 (00:22 +0200)
* commit 'd68c05380cebf563915412182643a8be04ef890b':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

See: c16e99e3b3c02edcf33245468731d414eab97dac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/x86/audio_convert_init.c
libavresample/x86/audio_mix_init.c
libavresample/x86/dither_init.c

Simple merge
Simple merge