| commit | 005c3318667cbcb9c38d723981e084a4f3017dd6 | [log] [tgz] |
|---|---|---|
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | Tue Oct 31 20:27:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 20:27:58 2017 +0000 |
| tree | 3b4b07bba1556509fe4bb09e1fda047b965602bc | |
| parent | 3b564f6e42d41652d15c16b9e33d2411805dd0ce [diff] | |
| parent | 11aca022424d6c7814b62844d9e8d5ce65321357 [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 Change-Id: Icb8f926f4c92230f856231ad3ccda33799fb99b6
diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp index cecc52b..1f47155 100644 --- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp +++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -578,7 +578,7 @@ notifyEmptyBufferDone(inHeader); if (!(inHeader->nFlags & OMX_BUFFERFLAG_EOS)) { - continue; + return; } mReceivedEOS = true;