commit 940335776b6d4eb91b13c4e56bc20bed3ac0011b
author Dave Burke <daveburke@google.com> Wed Apr 25 23:30:18 2012 -0700
committer Dave Burke <daveburke@google.com> Wed Apr 25 23:30:18 2012 -0700
tree 9384212a5c15f70029f9914393bec39f60e8a59b
parent aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b

Handle reconfiguration properly.

Bug 6388957.

Change-Id: I61a86ed6fdad99497535249acda5e4a325911918

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index aa65a0b..7706bf6 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -375,7 +375,7 @@
          * Thus, we could not say for sure whether a stream is
          * AAC+/eAAC+ until the first data frame is decoded.
          */
-        if (decoderErr == AAC_DEC_OK && mInputBufferCount <= 2) {
+        if (mInputBufferCount <= 2) {
             if (mStreamInfo->sampleRate != prevSampleRate) {
                 // We're going to want to revisit this input buffer, but
                 // may have already advanced the offset. Undo that if