mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c': mlpdsp: x86: Respect cpuflags Conflicts: libavcodec/x86/mlpdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9d47333e3e
|
@ -20,7 +20,9 @@
|
|||
*/
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/cpu.h"
|
||||
#include "libavutil/x86/asm.h"
|
||||
#include "libavutil/x86/cpu.h"
|
||||
#include "libavcodec/mlpdsp.h"
|
||||
#include "libavcodec/mlp.h"
|
||||
|
||||
|
@ -177,6 +179,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff,
|
|||
av_cold void ff_mlpdsp_init_x86(MLPDSPContext *c)
|
||||
{
|
||||
#if HAVE_7REGS && HAVE_INLINE_ASM
|
||||
int cpu_flags = av_get_cpu_flags();
|
||||
if (INLINE_MMX(cpu_flags))
|
||||
c->mlp_filter_channel = mlp_filter_channel_x86;
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue