commit c5bf17d8235e8f9a1e84f73767fcecc3c8879a68
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> Tue Oct 02 23:42:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 02 23:42:29 2018 -0700
tree f893406814a8e7dd790c707cbbecbb30d76930bc
parent 5581d7c6668798270e8c0e65dfe9034bc7ca787b
parent 7b8cad4e2458ecfa2e8dc8ddd5fbc8cf44346713

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

Change-Id: I1edec42d5f033edf9d24446ed1866965a1324274

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 68adf3c..f720667 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) {