fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84 am: a98beef0cf

Browse Source 
am: d145d90619

Change-Id: Ic018092c0fc9f5f2ec422f29f1323ed514b53803
This commit is contained in:
Jean-Michel Trivi
2018-12-26 18:45:13 -08:00
committed by android-build-merger
parent 58600c035a d145d90619
commit 6a506100ee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libAACenc/src/aacenc_lib.cpp
View File

@@ -1733,9 +1733,10 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder,
} }
/* check if buffer descriptors are filled out properly. */ /* check if buffer descriptors are filled out properly. */
if ((AACENC_OK != validateBufDesc(inBufDesc)) || if ((inargs == NULL) || (outargs == NULL) ||
(AACENC_OK != validateBufDesc(outBufDesc)) || (inargs == NULL) || ((AACENC_OK != validateBufDesc(inBufDesc)) &&
(outargs == NULL)) { (inargs->numInSamples > 0)) ||
(AACENC_OK != validateBufDesc(outBufDesc))) {
err = AACENC_UNSUPPORTED_PARAMETER; err = AACENC_UNSUPPORTED_PARAMETER;
goto bail; goto bail;
} }