diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-28 15:24:26 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-28 15:24:26 -0800 |
| commit | 56b20d2c760a2fde22eaf838b33e9bc00be4ddfb (patch) | |
| tree | ab65e8f2f532dc817f1bf866ab0bb01feb53a9a4 | |
| parent | f1010806752315c7b7ddba3a537a434f6001783a (diff) | |
| parent | ccbdcbecd059995b7bb24ffac612fdc10c921d80 (diff) | |
| download | fdk-aac-56b20d2c760a2fde22eaf838b33e9bc00be4ddfb.tar.gz fdk-aac-56b20d2c760a2fde22eaf838b33e9bc00be4ddfb.tar.bz2 fdk-aac-56b20d2c760a2fde22eaf838b33e9bc00be4ddfb.zip | |
Merge "Fix element list in channel_configuration_14 description" am: 83e30f0f7b am: e9e770ba71
am: ccbdcbecd0
Change-Id: I7aa9ae31e6e0a54d8e8fe3b32bfea5c68663bc5f
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 2 |
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, |