diff options
| author | Marco Nelissen <marcone@google.com> | 2014-02-10 18:13:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-10 18:13:18 +0000 |
| commit | 2ca060c742a47034cea0ad2fb4aa10f0d6b59a09 (patch) | |
| tree | 6c832b7d38d7592d1604fde5658974116f33f6ff /media | |
| parent | a6d4f9374b9921ab4a186608598535f5af81643a (diff) | |
| parent | 6a9ebb41a8084b73e654a25d97a6ae26ff4166d4 (diff) | |
| download | frameworks_av-2ca060c742a47034cea0ad2fb4aa10f0d6b59a09.zip frameworks_av-2ca060c742a47034cea0ad2fb4aa10f0d6b59a09.tar.gz frameworks_av-2ca060c742a47034cea0ad2fb4aa10f0d6b59a09.tar.bz2 | |
Merge "Fix regression"
Diffstat (limited to 'media')
| -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????? |