diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:15:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:15:40 -0700 |
| commit | 660def30bd7d431cb50a592823a49c4301957ad0 (patch) | |
| tree | 91469d691a2b53cc9e1dcdf1c2f2560e494ebefc | |
| parent | 2d8f9d4a3378775ce0b4fda0a61101f686e37ae9 (diff) | |
| parent | 7cad90adba8f7a097488297afce4466985dc5b58 (diff) | |
| download | frameworks_av-660def30bd7d431cb50a592823a49c4301957ad0.zip frameworks_av-660def30bd7d431cb50a592823a49c4301957ad0.tar.gz frameworks_av-660def30bd7d431cb50a592823a49c4301957ad0.tar.bz2 | |
am 7cad90ad: am 76d46c5a: am 4348cbce: am 67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '7cad90adba8f7a097488297afce4466985dc5b58':
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( |