| commit | 2adf132c95e530a685e718abfbf29dc20f63411a | [log] [tgz] |
|---|---|---|
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | Tue Oct 31 20:46:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 20:46:57 2017 +0000 |
| tree | 97c0628b54f66f21836cb08dc2a7eac3fdf465ee | |
| parent | 26214cfbaabc4d1c41d7993789e38cda58da9d3e [diff] | |
| parent | 352648debd5969e3aa11abb045da7148b2cebca6 [diff] |
Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c am: 8434933a6b am: 11aca02242 am: 005c331866 am: 352648debd Change-Id: I69142d8f64dd29e4d5d828aa776f5d3b925f013b
diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp index 248ab6d..0db011c 100644 --- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp +++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -526,7 +526,7 @@ notifyEmptyBufferDone(inHeader); if (!(inHeader->nFlags & OMX_BUFFERFLAG_EOS)) { - continue; + return; } mReceivedEOS = true;