commit | 09b83308d75504a5fcda5b933341715bf6cd429e | [log] [tgz] |
---|---|---|
author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | Tue Oct 31 21:24:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 21:24:18 2017 +0000 |
tree | 0b843fc117d4e0c7f7d271f0d4a274c1d021bf6e | |
parent | 7d2b91dde7ac623720aec91de70d189c6a74fd53 [diff] | |
parent | ed7477e56589c1c0b6fb8ab7b623b8a4abff9176 [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 am: 2adf132c95 am: ed7477e565 Change-Id: Id6f499bff9b065d0966324741d52b58faf18607d
diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp index c342b6c..70df501 100644 --- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp +++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -530,7 +530,7 @@ notifyEmptyBufferDone(inHeader); if (!(inHeader->nFlags & OMX_BUFFERFLAG_EOS)) { - continue; + return; } mReceivedEOS = true;