diff options
| author | Dave Burke <daveburke@google.com> | 2012-05-18 17:44:51 -0700 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2012-05-21 21:17:01 -0700 |
| commit | d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444 (patch) | |
| tree | 564572252ccfe044be34eb5ce03797cc8fc1e8c6 | |
| parent | a92896f62d8f4a4a6ff61f26439ad61c210ce728 (diff) | |
| download | frameworks_av-d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444.zip frameworks_av-d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444.tar.gz frameworks_av-d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444.tar.bz2 | |
Revert to PV for AAC codec for FactoryROM.
Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
| -rw-r--r-- | media/libstagefright/codecs/aacdec/Android.mk | 4 | ||||
| -rw-r--r-- | 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) |