diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-27 22:18:54 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-27 22:18:54 +0000 |
commit | ecc96969d7db139242dbba9930857ed5ce955b29 (patch) | |
tree | e78e88638c742d3dcd5f704d6ad50758d256a945 /libMpegTPDec/src/tpdec_lib.cpp | |
parent | f828d3e16adfb4cb428b4f3a2c155f89853cebbe (diff) | |
parent | 0cebd077b61cc0946ea4062bf816defdffaef72b (diff) | |
download | fdk-aac-ecc96969d7db139242dbba9930857ed5ce955b29.tar.gz fdk-aac-ecc96969d7db139242dbba9930857ed5ce955b29.tar.bz2 fdk-aac-ecc96969d7db139242dbba9930857ed5ce955b29.zip |
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
* changes:
Apply sbrDecoder_Parse() function for all explict SBR elements
Call QMF transposer initialization only with successful SBR processing
Add error path to generateFixFixOnly()
Add missing break in order to avoid a fallthrough in setConcealMethod()
Add FDK_FALLTHROUGH macro to prevent implicit-fallthrough compiler warnings
Diffstat (limited to 'libMpegTPDec/src/tpdec_lib.cpp')
-rw-r--r-- | libMpegTPDec/src/tpdec_lib.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp index 2a40187..1976cb9 100644 --- a/libMpegTPDec/src/tpdec_lib.cpp +++ b/libMpegTPDec/src/tpdec_lib.cpp @@ -956,6 +956,7 @@ static TRANSPORTDEC_ERROR transportDec_readHeader( hTp->parser.latm.m_audioMuxLengthBytes = syncLayerFrameBits; syncLayerFrameBits <<= 3; } + FDK_FALLTHROUGH; case TT_MP4_LATM_MCP1: case TT_MP4_LATM_MCP0: if (hTp->numberOfRawDataBlocks <= 0) { |