From d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444 Mon Sep 17 00:00:00 2001 From: Dave Burke Date: Fri, 18 May 2012 17:44:51 -0700 Subject: Revert to PV for AAC codec for FactoryROM. Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5 --- media/libstagefright/codecs/aacdec/Android.mk | 4 ++-- media/libstagefright/codecs/aacenc/Android.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk index b7c3788..55cf797 100644 --- a/media/libstagefright/codecs/aacdec/Android.mk +++ b/media/libstagefright/codecs/aacdec/Android.mk @@ -1,8 +1,8 @@ LOCAL_PATH:= $(call my-dir) -AAC_LIBRARY = fraunhofer +AAC_LIBRARY = pv -ifeq ($(AAC_LIBRARY), fraunhofer) +ifneq ($(AAC_LIBRARY), pv) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index 98e702e..a18e49f 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include frameworks/av/media/libstagefright/codecs/common/Config.mk -AAC_LIBRARY = fraunhofer +AAC_LIBRARY = visualon LOCAL_SRC_FILES := basic_op/basicop2.c basic_op/oper_32b.c @@ -90,7 +90,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -ifeq ($(AAC_LIBRARY), fraunhofer) +ifneq ($(AAC_LIBRARY), visualon) include $(CLEAR_VARS) -- cgit v1.1