commit 21d312e7187ca9d7399f0ec6cae189cc1c5651c9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 03 06:18:19 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 03 06:18:19 2018 +0000
tree c164cd74b37b0bf19587e732845811fee46b75d4
parent 9a6b8202940678a79bc33b57c0aa1db7bb4aa5d7
parent 27e12d6864c6f2cbf56c426cea0787e2de31eff4

Merge "Fix codec output format for conversion"

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) {