1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-17 11:40:35 +01:00

Merge "Encoder returned an error while explicit flushing"

This commit is contained in:
Jean-Michel Trivi 2018-12-27 02:01:43 +00:00 committed by Gerrit Code Review
commit 2f5612ef84

View File

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