commit 4c6c1f1d582a0aae24aa3ecef3fc1166513efba0
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 29 10:58:22 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 29 10:58:22 2012 -0700
tree 343680c557b69b38ebcfa3e5f2a2ed40bacc3347
parent bcf07da1e2bc3d57a140636e67a6577791290768
parent bf30787f2694057e775f3b527b649a9f8074237b

am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"

* commit 'bf30787f2694057e775f3b527b649a9f8074237b':
  avcenc: Don't erase the InputBufferInfo before reading info from it

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 a2ef3a1..81ee419 100644
--- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
+++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
@@ -909,12 +909,12 @@
         outQueue.erase(outQueue.begin());
         CHECK(!mInputBufferInfoVec.empty());
         InputBufferInfo *inputBufInfo = mInputBufferInfoVec.begin();
-        mInputBufferInfoVec.erase(mInputBufferInfoVec.begin());
         outHeader->nTimeStamp = inputBufInfo->mTimeUs;
         outHeader->nFlags |= (inputBufInfo->mFlags | OMX_BUFFERFLAG_ENDOFFRAME);
         outHeader->nFilledLen = dataLength;
         outInfo->mOwnedByUs = false;
         notifyFillBufferDone(outHeader);
+        mInputBufferInfoVec.erase(mInputBufferInfoVec.begin());
     }
 }