aboutsummaryrefslogtreecommitdiffstats
path: root/libSACdec/src
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-27 14:28:38 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-27 14:28:38 -0800
commitf5512132f3850ab06a13b9e541cac51f6f389bf2 (patch)
treee78e88638c742d3dcd5f704d6ad50758d256a945 /libSACdec/src
parent2027969e1f72be4464e48f1bc0065b2bed1590b9 (diff)
parentecc96969d7db139242dbba9930857ed5ce955b29 (diff)
downloadfdk-aac-f5512132f3850ab06a13b9e541cac51f6f389bf2.tar.gz
fdk-aac-f5512132f3850ab06a13b9e541cac51f6f389bf2.tar.bz2
fdk-aac-f5512132f3850ab06a13b9e541cac51f6f389bf2.zip
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
am: ecc96969d7 Change-Id: I588392116ecdf22e1266ec6fff8416fa87d911c4
Diffstat (limited to 'libSACdec/src')
-rw-r--r--libSACdec/src/sac_dec_lib.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libSACdec/src/sac_dec_lib.cpp b/libSACdec/src/sac_dec_lib.cpp
index 5ae89d1..e881599 100644
--- a/libSACdec/src/sac_dec_lib.cpp
+++ b/libSACdec/src/sac_dec_lib.cpp
@@ -1349,6 +1349,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
pMpegSurroundDecoder->mpegSurroundSscIsGlobalCfg = 0;
}
}
+ FDK_FALLTHROUGH;
case MPEGS_ANCTYPE_FRAME:
if (pMpegSurroundDecoder