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

Commit 39a7ae62 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."

parents 2f6c2e06 442cc6dc

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3735,7 +3735,7 @@ status_t MPEG4Source::fragmentedRead( 
    }



    off64_t offset = 0;

    size_t size;

    size_t size = 0;

    uint32_t cts = 0;

    bool isSyncSample = false;

    bool newBuffer = false;

media/libstagefright/codecs/amrwbenc/src/pitch_f4.c

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#define UP_SAMP      4

#define L_INTERPOL1  4



#define UNUSED(x) (void)(x)



/* Local functions */



#ifdef ASM_OPT
@@ -171,6 +173,7 @@ static void Norm_Corr( 
	Word32 corr, exp_corr, norm, exp, scale;

	Word16 exp_norm, excf[L_SUBFR], tmp;

	Word32 L_tmp, L_tmp1, L_tmp2;

        UNUSED(L_subfr);



	/* compute the filtered excitation for the first delay t_min */

	k = -t_min;

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ void SoftAVCEncoder::onQueueFilled(OMX_U32 /* portIndex */) { 
            }

        }



        buffer_handle_t srcBuffer; // for MetaDataMode only

        buffer_handle_t srcBuffer = NULL; // for MetaDataMode only



        // Get next input video frame

        if (mReadyForNextFrame) {

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) { 
            mSawInputEOS = true;

        }



        buffer_handle_t srcBuffer; // for MetaDataMode only

        buffer_handle_t srcBuffer = NULL; // for MetaDataMode only

        if (inHeader->nFilledLen > 0) {

            uint8_t *inputData = NULL;

            if (mStoreMetaDataInBuffers) {