diff options
| author | Marco Nelissen <marcone@google.com> | 2014-02-07 14:42:22 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-02-10 08:34:41 -0800 |
| commit | 6a9ebb41a8084b73e654a25d97a6ae26ff4166d4 (patch) | |
| tree | 60361998c310b48a1f957c656bf39d8a521d5992 /media/libstagefright/codecs | |
| parent | ec95f0e82a680931e9c7c9011dbbd68d5ab484c8 (diff) | |
| download | frameworks_av-6a9ebb41a8084b73e654a25d97a6ae26ff4166d4.zip frameworks_av-6a9ebb41a8084b73e654a25d97a6ae26ff4166d4.tar.gz frameworks_av-6a9ebb41a8084b73e654a25d97a6ae26ff4166d4.tar.bz2 | |
Fix regression
CTS DecoderTest.testBug11696552 started failing again, and this fixes that
Change-Id: I422c3b249a1d5eb25422573d2106d1f142ccfab6
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 2f5eff4..4ac8999 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -377,7 +377,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { mNumSamplesOutput = 0; } - if (mIsADTS) { + if (mIsADTS && inHeader->nFilledLen) { size_t adtsHeaderSize = 0; // skip 30 bits, aac_frame_length follows. // ssssssss ssssiiip ppffffPc ccohCCll llllllll lll????? |