diff options
| author | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
| commit | d7fca408b48bbff22d186c42c75c9fe7a79b4515 (patch) | |
| tree | 0ae0bd9722aa4433179fa9e4f0d51c4b2782b0c7 | |
| parent | 97b382cd3f38e8b6082a9e4a37e701f02158d756 (diff) | |
| parent | 2b6bf8dc0941f3a4531030b950cf24fd31248b0b (diff) | |
| download | fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.gz fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.bz2 fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.zip | |
Merge remote-tracking branch 'aosp/master'
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 6 | ||||
| -rw-r--r-- | libSYS/src/genericStds.cpp | 2 |
3 files changed, 6 insertions, 9 deletions
@@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \ $(sbrdec_sources:%=libSBRdec/src/%) \ $(sbrenc_sources:%=libSBRenc/src/%) -LOCAL_CFLAGS := -DANDROID LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra LOCAL_C_INCLUDES := \ @@ -53,10 +52,8 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/libSBRdec/include \ $(LOCAL_PATH)/libSBRenc/include -# In tpdec_asc.cpp: address of array 'pPce->FrontElementIsCpe' -# will always evaluate to 'true'. -LOCAL_CLANG_CPPFLAGS += \ - -Wno-pointer-bool-conversion + +LOCAL_CPPFLAGS += -std=c++98 LOCAL_MODULE:= libFraunhoferAAC diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp index 82adec1..bae271e 100644 --- a/libMpegTPDec/src/tpdec_asc.cpp +++ b/libMpegTPDec/src/tpdec_asc.cpp @@ -449,13 +449,13 @@ void CProgramConfig_GetDefault( CProgramConfig *pPce, int el, elTagSce = 0, elTagCpe = 0; for (el = 0; el < pPce->NumFrontChannelElements; el += 1) { - pPce->FrontElementTagSelect[el] = (pPce->FrontElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->FrontElementTagSelect[el] = (pPce->FrontElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } for (el = 0; el < pPce->NumSideChannelElements; el += 1) { - pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } for (el = 0; el < pPce->NumBackChannelElements; el += 1) { - pPce->BackElementTagSelect[el] = (pPce->BackElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->BackElementTagSelect[el] = (pPce->BackElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } elTagSce = 0; for (el = 0; el < pPce->NumLfeChannelElements; el += 1) { diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp index d0b4a90..f405483 100644 --- a/libSYS/src/genericStds.cpp +++ b/libSYS/src/genericStds.cpp @@ -116,7 +116,7 @@ amm-info@iis.fraunhofer.de /* Include OS/System specific implementations. */ -#if defined(__linux__) /* cppp replaced: elif */ +#if defined(__linux__) && !defined(__ANDROID__) /* cppp replaced: elif */ #include "linux/genericStds_linux.cpp" #endif |