commit ef9fc7792d4995da68cb71a3e9f2304e565a016d
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Oct 31 21:39:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 21:39:16 2017 +0000
tree 127b9bad640110ecf3f8c230c1f9095bb7a30edd
parent 651b2315342067d33d9d98c85de7fb4912e08291
parent 09b83308d75504a5fcda5b933341715bf6cd429e

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
am: 09b83308d7

Change-Id: I0f064e942fd0eafc5db7c5dd1bdd5309105b7027

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

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;