Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f107c6 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f4eb754b: am 2a428fd4: Merge change I85e5d39e into eclair-mr2 

Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'

* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
  Two more uses of strlcpy that break the sim build. Now fixed.
parents e4402499 05250b37

media/libstagefright/omx/mp3dec/MP3Decoder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void MP3Decoder::initPort(OMX_U32 portIndex) { 


    if (portIndex == kPortIndexInput) {

        def->nBufferSize = 8192;

        strlcpy(audioDef->cMIMEType, "audio/mpeg", 128);

        strcpy(audioDef->cMIMEType, "audio/mpeg");

        audioDef->pNativeRender = NULL;

        audioDef->bFlagErrorConcealment = OMX_FALSE;

        audioDef->eEncoding = OMX_AUDIO_CodingMP3;
@@ -59,7 +59,7 @@ void MP3Decoder::initPort(OMX_U32 portIndex) { 
        CHECK_EQ(portIndex, kPortIndexOutput);



        def->nBufferSize = 8192;

        strlcpy(audioDef->cMIMEType, "audio/raw", 128);

        strcpy(audioDef->cMIMEType, "audio/raw");

        audioDef->pNativeRender = NULL;

        audioDef->bFlagErrorConcealment = OMX_FALSE;

        audioDef->eEncoding = OMX_AUDIO_CodingPCM;