diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-16 11:37:41 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-16 11:54:42 -0700 |
| commit | 7023f4d0e96b562046608aeb15e755778b3b8713 (patch) | |
| tree | b205753dcd0e04ac29faa9965e29d4c17c093f4f /decoder | |
| parent | 7e7f176198dae244193b47574751193de1f431f0 (diff) | |
| download | android_external_libavc-7023f4d0e96b562046608aeb15e755778b3b8713.tar.gz android_external_libavc-7023f4d0e96b562046608aeb15e755778b3b8713.tar.bz2 android_external_libavc-7023f4d0e96b562046608aeb15e755778b3b8713.zip | |
fix build for generic builds
Change-Id: I7654a801a2b168b7e0bcbebf680efbf2343b1ece
Diffstat (limited to 'decoder')
| -rwxr-xr-x | decoder/arm/ih264d_function_selector.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/decoder/arm/ih264d_function_selector.c b/decoder/arm/ih264d_function_selector.c index 1aa0c43..925043b 100755 --- a/decoder/arm/ih264d_function_selector.c +++ b/decoder/arm/ih264d_function_selector.c @@ -61,24 +61,25 @@ void ih264d_init_function_ptr(dec_struct_t *ps_codec) ih264d_init_function_ptr_generic(ps_codec); switch(e_proc_arch) { - case ARCH_ARM_NONEON: - ih264d_init_function_ptr_generic(ps_codec); +#if defined(ARMV8) + case ARCH_ARMV8_GENERIC: + default: + ih264d_init_function_ptr_av8(ps_codec); break; -#ifndef ARMV8 +#elif !defined(DISABLE_NEON) case ARCH_ARM_A5: case ARCH_ARM_A7: case ARCH_ARM_A9: case ARCH_ARM_A15: case ARCH_ARM_A9Q: default: - ih264d_init_function_ptr_a9q(ps_codec); + ih264d_init_function_ptr_a9q(ps_codec); break; -#else /* ARMV8 */ - case ARCH_ARMV8_GENERIC: +#else default: - ih264d_init_function_ptr_av8(ps_codec); +#endif + case ARCH_ARM_NONEON: break; -#endif /* ARMV8 */ } } |