commit 359cf1cac2a7851a59dfe4960a1a5992ac6fdb84
author Jean-Baptiste Queru <jbq@google.com> Wed Sep 12 15:42:30 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 12 15:42:30 2012 -0700
tree 7a193584341c2a5ee9ab7421378bca94287f2637
parent e891a7888141fcd3e7956bf80425c885992fa2bf
parent a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d

am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"

* commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
  avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
index 81ee419..1d66120 100644
--- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
+++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
@@ -911,6 +911,9 @@
         InputBufferInfo *inputBufInfo = mInputBufferInfoVec.begin();
         outHeader->nTimeStamp = inputBufInfo->mTimeUs;
         outHeader->nFlags |= (inputBufInfo->mFlags | OMX_BUFFERFLAG_ENDOFFRAME);
+        if (mSawInputEOS) {
+            outHeader->nFlags |= OMX_BUFFERFLAG_EOS;
+        }
         outHeader->nFilledLen = dataLength;
         outInfo->mOwnedByUs = false;
         notifyFillBufferDone(outHeader);