drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2a428fd4: Merge change I85e5d39e into eclair-mr2

Browse Source 
Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp

* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
  Two more uses of strlcpy that break the sim build. Now fixed.
This commit is contained in:
Andreas Huber
2009-12-03 16:53:27 -08:00
committed by Android Git Automerger
parent 3bac3ad2df 2a428fd463
commit f4eb754b18
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/omx/mp3dec/MP3Decoder.cpp
View File

@ -51,7 +51,7 @@ void MP3Decoder::initPort(OMX_U32 portIndex) {
if (portIndex == kPortIndexInput) { if (portIndex == kPortIndexInput) {
def->nBufferSize = 8192; def->nBufferSize = 8192;
strlcpy(audioDef->cMIMEType, "audio/mpeg", 128); strcpy(audioDef->cMIMEType, "audio/mpeg");
audioDef->pNativeRender = NULL; audioDef->pNativeRender = NULL;
audioDef->bFlagErrorConcealment = OMX_FALSE; audioDef->bFlagErrorConcealment = OMX_FALSE;
audioDef->eEncoding = OMX_AUDIO_CodingMP3; audioDef->eEncoding = OMX_AUDIO_CodingMP3;
@ -59,7 +59,7 @@ void MP3Decoder::initPort(OMX_U32 portIndex) {
CHECK_EQ(portIndex, kPortIndexOutput); CHECK_EQ(portIndex, kPortIndexOutput);
def->nBufferSize = 8192; def->nBufferSize = 8192;
strlcpy(audioDef->cMIMEType, "audio/raw", 128); strcpy(audioDef->cMIMEType, "audio/raw");
audioDef->pNativeRender = NULL; audioDef->pNativeRender = NULL;
audioDef->bFlagErrorConcealment = OMX_FALSE; audioDef->bFlagErrorConcealment = OMX_FALSE;
audioDef->eEncoding = OMX_AUDIO_CodingPCM; audioDef->eEncoding = OMX_AUDIO_CodingPCM;