diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:08:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:08:13 -0700 |
| commit | 4348cbcec6c3aec02af722d633ebda24f94dfcc8 (patch) | |
| tree | f1e79565b29a16bf731ff447f92e91c2820e599d | |
| parent | 96d18cca4546045df118660017e74ddd751dfbb4 (diff) | |
| parent | 67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9 (diff) | |
| download | frameworks_av-4348cbcec6c3aec02af722d633ebda24f94dfcc8.zip frameworks_av-4348cbcec6c3aec02af722d633ebda24f94dfcc8.tar.gz frameworks_av-4348cbcec6c3aec02af722d633ebda24f94dfcc8.tar.bz2 | |
am 67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9':
Initialize pool's buffer pointers to null.
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c index 98919d2..f4cfa7c 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c @@ -53,6 +53,7 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool, { M4OSA_ERR lerr = M4NO_ERROR; VIDEOEDITOR_BUFFER_Pool* pool; + M4OSA_UInt32 index; ALOGV("VIDEOEDITOR_BUFFER_allocatePool : ppool = 0x%x nbBuffers = %d ", ppool, nbBuffers); @@ -79,6 +80,11 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool, goto VIDEOEDITOR_BUFFER_allocatePool_Cleanup; } + for (index = 0; index < nbBuffers; index++) + { + pool->pNXPBuffer[index].pData = M4OSA_NULL; + } + ALOGV("VIDEOEDITOR_BUFFER_allocatePool : Allocating Pool name buffer"); pool->poolName = M4OSA_NULL; pool->poolName = (M4OSA_Char*)M4OSA_32bitAlignedMalloc( |