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

Commit be0284c2 authored by George Burgess's avatar George Burgess Committed by Android (Google) Code Review
Browse files

Merge "mediacodec: hoist NULL assignments to variable initialization"

parents bc53cf51 d8529a4c

media/libstagefright/MediaCodec.cpp

+2 −4
Original line number Diff line number Diff line
@@ -4534,8 +4534,8 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { 
    }

    const CryptoPlugin::SubSample *subSamples;

    size_t numSubSamples;

    const uint8_t *key;

    const uint8_t *iv;

    const uint8_t *key = NULL;

    const uint8_t *iv = NULL;

    CryptoPlugin::Mode mode = CryptoPlugin::kMode_Unencrypted;



    // We allow the simpler queueInputBuffer API to be used even in
@@ -4550,8 +4550,6 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { 


            subSamples = &ss;

            numSubSamples = 1;

            key = NULL;

            iv = NULL;

            pattern.mEncryptBlocks = 0;

            pattern.mSkipBlocks = 0;

        }