--- a/media/libstagefright/binding/DecoderData.cpp
+++ b/media/libstagefright/binding/DecoderData.cpp
@@ -233,20 +233,24 @@ MP4AudioInfo::Update(const mp4parse_trac
   mTrackId = track->track_id;
 
   // In stagefright, mProfile is kKeyAACProfile, mExtendedProfile is kKeyAACAOT.
   // Both are from audioObjectType in AudioSpecificConfig.
   if (audio->profile <= 4) {
     mProfile = audio->profile;
   }
 
-  const uint8_t* cdata = audio->codec_specific_config.data;
-  size_t size = audio->codec_specific_config.length;
-  if (size > 0) {
-    mCodecSpecificConfig->AppendElements(cdata, size);
+  if (audio->codec_specific_config.length > 0) {
+    mExtraData->AppendElements(audio->codec_specific_config.data,
+                               audio->codec_specific_config.length);
+  }
+
+  if (audio->codec_specific_data.length > 0) {
+    mCodecSpecificConfig->AppendElements(audio->codec_specific_data.data,
+                                         audio->codec_specific_data.length);
   }
 }
 
 void
 MP4VideoInfo::Update(const mp4parse_track_info* track,
                      const mp4parse_track_video_info* video)
 {
   UpdateTrackProtectedInfo(*this, video->protected_data);