diff options
author | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
---|---|---|
committer | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
commit | d7fca408b48bbff22d186c42c75c9fe7a79b4515 (patch) | |
tree | 0ae0bd9722aa4433179fa9e4f0d51c4b2782b0c7 /libMpegTPDec/src/tpdec_asc.cpp | |
parent | 97b382cd3f38e8b6082a9e4a37e701f02158d756 (diff) | |
parent | 2b6bf8dc0941f3a4531030b950cf24fd31248b0b (diff) | |
download | fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.gz fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.bz2 fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.zip |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libMpegTPDec/src/tpdec_asc.cpp')
-rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp index 82adec1..bae271e 100644 --- a/libMpegTPDec/src/tpdec_asc.cpp +++ b/libMpegTPDec/src/tpdec_asc.cpp @@ -449,13 +449,13 @@ void CProgramConfig_GetDefault( CProgramConfig *pPce, int el, elTagSce = 0, elTagCpe = 0; for (el = 0; el < pPce->NumFrontChannelElements; el += 1) { - pPce->FrontElementTagSelect[el] = (pPce->FrontElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->FrontElementTagSelect[el] = (pPce->FrontElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } for (el = 0; el < pPce->NumSideChannelElements; el += 1) { - pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } for (el = 0; el < pPce->NumBackChannelElements; el += 1) { - pPce->BackElementTagSelect[el] = (pPce->BackElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->BackElementTagSelect[el] = (pPce->BackElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } elTagSce = 0; for (el = 0; el < pPce->NumLfeChannelElements; el += 1) { |