From 57eb34e9d791a94afaa8307fdbd538a66e01080e Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 5 Aug 2015 16:30:55 +0900 Subject: Version update 1.2.0 -> 1.3.0 (fix crash on 64bit) Change-Id: Ide07602a8064b14e88d8842c777d5f68db71d644 Signed-off-by: Jeongmo Yang --- opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h') diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h index d38f953..fd66e9a 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h +++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo + * Copyright (C) 1998-2010 PacketVideo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,10 +49,7 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "basicop_malloc.h" -#if defined(PV_ARM_V5) -#include "basic_op_arm_v5.h" - -#elif defined(PV_ARM_GCC_V5) +#if ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC)) #include "basic_op_arm_gcc_v5.h" #else -- cgit v1.2.3