fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Linux compilation fix" 

am: b82c85d0b1

Change-Id: I934d6c1b7011453b71c28c9ec64da3f3af865782
This commit is contained in:
Jakub Pawlowski 2017-02-21 20:53:55 +00:00 committed by android-build-merger
parent 4910e5a352 b82c85d0b1
commit 7c8dd3bb93
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libPCMutils/src/pcmutils_lib.cpp
View File

@ -88,7 +88,9 @@ amm-info@iis.fraunhofer.de
expansion in the PCM time domain. expansion in the PCM time domain.
*******************************************************************************/ *******************************************************************************/
#ifndef __linux__
#include <log/log.h> #include <log/log.h>
#endif
#include "pcmutils_lib.h" #include "pcmutils_lib.h"
#include "genericStds.h" #include "genericStds.h"
@ -2079,7 +2081,9 @@ PCMDMX_ERROR pcmDmx_ApplyFrame (
} }
} }
if (ch != numInChannels) { if (ch != numInChannels) {
#ifndef __linux__
ALOGE("b/23876444"); ALOGE("b/23876444");
#endif
return PCMDMX_INVALID_ARGUMENT; return PCMDMX_INVALID_ARGUMENT;
} }