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

Commit 62a897c6 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 525b099a: Merge "Fix ALOGVs for 64bit" 

* commit '525b099a':
  Fix ALOGVs for 64bit
parents e276aef8 525b099a

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -701,8 +701,8 @@ size_t VideoEditorAudioPlayer::fillBuffer(void *data, size_t size) { 
                             mBGAudioPCMFileOriginalSeekPoint <=

                              (mBGAudioPCMFileTrimmedLength - len)) {



                            ALOGV("Checking mBGAudioPCMFileHandle %d",

                                (unsigned int)mBGAudioPCMFileHandle);

                            ALOGV("Checking mBGAudioPCMFileHandle %p",

                                  mBGAudioPCMFileHandle);



                            if (mBGAudioPCMFileHandle != M4OSA_NULL) {

                                ALOGV("fillBuffer seeking file to %lld",

libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -334,8 +334,8 @@ M4OSA_ERR VideoEditorMp3Reader_setOption(M4OSA_Context context, 
        (VideoEditorMp3Reader_Context*)context;

    M4OSA_ERR err = M4NO_ERROR;



    ALOGV("VideoEditorMp3Reader_Context begin: optionId: %d Value: %d ",

        (int)optionId,(int)pValue);

    ALOGV("VideoEditorMp3Reader_Context begin: optionId: %u Value: %p ",

          optionId, pValue);



    M4OSA_DEBUG_IF1((M4OSA_NULL == pReaderContext), M4ERR_PARAMETER,

        "invalid context pointer");