commit 33e28dd3c033641f4db9d1b99c7c88d6d08c61f7
author Jamie Gennis <jgennis@google.com> Fri Jun 22 15:18:26 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 22 15:18:26 2012 -0700
tree f6b0d536de41567175259a5a7d98e43144cd99bb
parent 39a3113539f9bcc86a8efe562780c23ac8731098
parent 2cd25a9056cc150b9fd3ac9b0bca37a1334ffd47

Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev

media/libstagefright/codecs/aacdec/SoftAAC.h

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC.h b/media/libstagefright/codecs/aacdec/SoftAAC.h
index c0789ab..2e75005 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC.h
+++ b/media/libstagefright/codecs/aacdec/SoftAAC.h
@@ -45,7 +45,7 @@
 
 private:
     enum {
-        kNumInputBuffers        = 32,
+        kNumInputBuffers        = 4,
         kNumOutputBuffers       = 4,
     };
 

media/libstagefright/codecs/aacdec/SoftAAC2.h

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.h b/media/libstagefright/codecs/aacdec/SoftAAC2.h
index ac379f4..0353196 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.h
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.h
@@ -44,7 +44,7 @@
 
 private:
     enum {
-        kNumInputBuffers        = 32,
+        kNumInputBuffers        = 4,
         kNumOutputBuffers       = 4,
     };