commit 47a2377ec07ad4ec06ecd25bfd45a37df91e68e6
author Marco Nelissen <marcone@google.com> Tue Jun 10 17:47:16 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 10 17:47:17 2014 +0000
tree 838eb0257668d0b7bed84df6fb40d8aa2791ad1c
parent 73ac4ff83af079f8d09348dbe8a2733fae23e443
parent ed83915060af3eaaf62feef2eb2eec1e7d431891

Merge "Remove unneeded code"

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index edb7448..64bf2b6 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -842,12 +842,6 @@
         // depend on fragments from the last one decoded.
         // drain all existing data
         drainDecoder();
-        // force decoder loop to drop the first decoded buffer by resetting these state variables,
-        // but only if initialization has already happened.
-        if (mInputBufferCount != 0) {
-            mInputBufferCount = 1;
-            mOutputBufferCount = -1;
-        }
     } else {
         while (outputDelayRingBufferSamplesAvailable() > 0) {
             int32_t ns = outputDelayRingBufferGetSamples(0,