diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 10:35:20 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 10:35:20 -0800 |
| commit | 5bf2560ce9b70bee077e0c264ac06648f0f63acc (patch) | |
| tree | f17ecec5321e8d583d045135f29f14f3c7418e71 /media/libstagefright/codecs/aacdec/SoftAAC2.cpp | |
| parent | eb76f318e9daf91dbf195bcb74852b3bd736a32a (diff) | |
| parent | b2059ff384eee8ffb70a7ec8fc5570405201c734 (diff) | |
| download | frameworks_av-5bf2560ce9b70bee077e0c264ac06648f0f63acc.zip frameworks_av-5bf2560ce9b70bee077e0c264ac06648f0f63acc.tar.gz frameworks_av-5bf2560ce9b70bee077e0c264ac06648f0f63acc.tar.bz2 | |
Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index cf50dc9..1b20cbb 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -604,6 +604,9 @@ void SoftAAC2::onReset() { // To make the codec behave the same before and after a reset, we need to invalidate the // streaminfo struct. This does that: mStreamInfo->sampleRate = 0; + + mSignalledError = false; + mOutputPortSettingsChange = NONE; } void SoftAAC2::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) { |