commit ccbdcbecd059995b7bb24ffac612fdc10c921d80
author Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 28 15:18:56 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 28 15:18:56 2018 -0800
tree 595e7d69108040a65d478069e0e082afa2eebbd9
parent d93de565ac84079f5774a13e61cd31b46b242575
parent e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df

Merge "Fix element list in channel_configuration_14 description" am: 83e30f0f7b
am: e9e770ba71

Change-Id: Iff794b79659de4e4ce552b4ecb5c171b3f959faa

libMpegTPDec/src/tpdec_asc.cpp

diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp
index 3b61eef..a81a137 100644
--- a/libMpegTPDec/src/tpdec_asc.cpp
+++ b/libMpegTPDec/src/tpdec_asc.cpp
@@ -139,7 +139,7 @@
     ID_SCE, ID_CPE, ID_CPE, ID_CPE, ID_CPE, ID_SCE, ID_LFE, ID_LFE, ID_SCE,
     ID_CPE, ID_CPE, ID_SCE, ID_CPE, ID_SCE, ID_SCE, ID_CPE, ID_NONE};
 static const MP4_ELEMENT_ID channel_configuration_14[] = {
-    ID_SCE, ID_CPE, ID_CPE, ID_LAST, ID_CPE, ID_NONE};
+    ID_SCE, ID_CPE, ID_CPE, ID_LFE, ID_CPE, ID_NONE};
 
 static const MP4_ELEMENT_ID *channel_configuration_array[] = {
     channel_configuration_0,  channel_configuration_1,