commit 735d1b926fa3e057c92d74cebacca2f243ead274
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 29 09:07:41 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Aug 29 09:07:41 2012 -0700
tree 16939b3e677363daab11d319c61d18181651723f
parent 2aa37a7d15f5e2246b8996d2600269684904c581
parent e61f13d2c710918f5267b3c835fcc20447b4e4d6

Merge "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 259562b..e46463c 100644
--- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
+++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
@@ -846,12 +846,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());
     }
 }