aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec/src/tpdec_asc.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-28 15:12:15 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-28 15:12:15 -0800
commite9e770ba71f8fb3f4a63b7efdbaa7d35adb299df (patch)
tree01540e0ca828b40bd4de7267e5cb8a5d07ff71c6 /libMpegTPDec/src/tpdec_asc.cpp
parent7e454bd098434338fa6da8d4a8164762d3abed0f (diff)
parent83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d (diff)
downloadfdk-aac-e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df.tar.gz
fdk-aac-e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df.tar.bz2
fdk-aac-e9e770ba71f8fb3f4a63b7efdbaa7d35adb299df.zip
Merge "Fix element list in channel_configuration_14 description"
am: 83e30f0f7b Change-Id: Ifb41f345377985c17a23847a218193cfc09708ea
Diffstat (limited to 'libMpegTPDec/src/tpdec_asc.cpp')
-rw-r--r--libMpegTPDec/src/tpdec_asc.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@ static const MP4_ELEMENT_ID channel_configuration_13[] = {
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,