diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 20:26:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 20:39:10 +0100 |
| commit | f38af0143c1849e8c8cea8d3374b4a554763eeee (patch) | |
| tree | 0d84e984281c2b46123d3e3854b262031bc7d287 /libavcodec/arm/mlpdsp_init_arm.c | |
| parent | 87b128d5ef6aeb01cc8bba167c929c74cbf2e7c7 (diff) | |
| parent | 15a29c39d9ef15b0783c04b3228e1c55f6701ee3 (diff) | |
| download | ffmpeg-f38af0143c1849e8c8cea8d3374b4a554763eeee.tar.gz | |
Merge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'
* commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3':
truehd: add hand-scheduled ARM asm version of mlp_filter_channel.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/mlpdsp_init_arm.c
See: 87b128d5ef6aeb01cc8bba167c929c74cbf2e7c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/mlpdsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/mlpdsp_init_arm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/arm/mlpdsp_init_arm.c b/libavcodec/arm/mlpdsp_init_arm.c index 9a14815463..a8319ce88a 100644 --- a/libavcodec/arm/mlpdsp_init_arm.c +++ b/libavcodec/arm/mlpdsp_init_arm.c @@ -32,5 +32,9 @@ void ff_mlp_filter_channel_arm(int32_t *state, const int32_t *coeff, av_cold void ff_mlpdsp_init_arm(MLPDSPContext *c) { - c->mlp_filter_channel = ff_mlp_filter_channel_arm; + int cpu_flags = av_get_cpu_flags(); + + if (have_armv5te(cpu_flags)) { + c->mlp_filter_channel = ff_mlp_filter_channel_arm; + } } |