commit d145d90619598cdcd441c18505a1b79d0300eff2
author Jean-Michel Trivi <jmtrivi@google.com> Wed Dec 26 18:31:39 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 26 18:31:39 2018 -0800
tree 985a54bdcb2df2380a2ec0738cba5869ed7b70f8
parent d07eeb453f9bc1cb05fb03391a6a9a1dab2f6fae
parent a98beef0cf4e9887d179bf3725c8ea77c1b11b86

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

Change-Id: Ie8198a53d1666d97ae586c9984b8ffcdb6c528c7

libAACenc/src/aacenc_lib.cpp

diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp
index 11db3da..f92cff4 100644
--- a/libAACenc/src/aacenc_lib.cpp
+++ b/libAACenc/src/aacenc_lib.cpp
@@ -1733,9 +1733,10 @@
   }
 
   /* 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;
   }