aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-28 23:04:16 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-28 23:04:16 +0000
commit83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d (patch)
tree01540e0ca828b40bd4de7267e5cb8a5d07ff71c6
parent3e0a7a40c5ed198850b061ac0127f19b43a20b82 (diff)
parentb8467f6d3255f3df0705ca637f0ff72b2e2b0f03 (diff)
downloadfdk-aac-83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d.tar.gz
fdk-aac-83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d.tar.bz2
fdk-aac-83e30f0f7b8ceea2c4bd6912d60df2a19cc8c74d.zip
Merge "Fix element list in channel_configuration_14 description"
-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,