commit 7b8cad4e2458ecfa2e8dc8ddd5fbc8cf44346713
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> Tue Oct 02 23:34:18 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 02 23:34:18 2018 -0700
tree 4e29868f5898eae0bd3b02f74748ccbf4496e171
parent c05fe5d0ce8f9277a98a7979b20365033742a9be
parent 44b720db70e38a5a48814a5301d79eb39ff5adf3

Merge "Fix codec output format for conversion" am: 21d312e718
am: 44b720db70

Change-Id: Idd4a03c69565e2a144678fcc30e39e4fac67012f

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 47dca13..4b04408 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5384,7 +5384,7 @@
         AudioEncoding pcmEncoding = kAudioEncodingPcm16bit;
         (void)mConfigFormat->findInt32("pcm-encoding", (int32_t*)&pcmEncoding);
         AudioEncoding codecPcmEncoding = kAudioEncodingPcm16bit;
-        (void)mOutputFormat->findInt32("pcm-encoding", (int32_t*)&pcmEncoding);
+        (void)mOutputFormat->findInt32("pcm-encoding", (int32_t*)&codecPcmEncoding);
 
         mConverter[kPortIndexOutput] = AudioConverter::Create(codecPcmEncoding, pcmEncoding);
         if (mConverter[kPortIndexOutput] != NULL) {