commit 3326dffb07bc7cb724cae31923a122321ff5bb1a
author Andreas Huber <andih@google.com> Wed Nov 14 11:45:51 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 14 11:45:52 2012 -0800
tree 09a58cdc923335010853d33b767c527ff4c8a070
parent 83c9bd167600b3ff77008a6c06c05bb1f189d4ca
parent b81ed713b09d6db0f01d052fcd3f6bdfb5dd05c1

Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 0ca027b..84b4962 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -937,7 +937,8 @@
             }
 
             err = setupAACCodec(
-                    encoder, numChannels, sampleRate, bitRate, aacProfile, isADTS != 0);
+                    encoder, numChannels, sampleRate, bitRate, aacProfile,
+                    isADTS != 0);
         }
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB)) {
         err = setupAMRCodec(encoder, false /* isWAMR */, bitRate);
@@ -986,6 +987,10 @@
         }
     }
 
+    if (err != OK) {
+        return err;
+    }
+
     if (!msg->findInt32("encoder-delay", &mEncoderDelay)) {
         mEncoderDelay = 0;
     }