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

Commit 38a9f405 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am e95d192f: Mainly fix two mistakes that I made: 

Merge commit 'e95d192f' into gingerbread-plus-aosp

* commit 'e95d192f':
  Mainly fix two mistakes that I made:
parents 2f020449 e95d192f

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ AVCEncoder::AVCEncoder( 
    : mSource(source),

      mMeta(meta),

      mNumInputFrames(-1),

      mPrevTimestampUs(-1),

      mStarted(false),

      mInputBuffer(NULL),

      mInputFrameData(NULL),

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

+1 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ M4vH263Encoder::M4vH263Encoder( 
      mMeta(meta),

      mNumInputFrames(-1),

      mNextModTimeUs(0),

      mPrevTimestampUs(-1),

      mStarted(false),

      mInputBuffer(NULL),

      mInputFrameData(NULL),
@@ -292,8 +293,6 @@ status_t M4vH263Encoder::read( 
    if (OK != mSource->read(&mInputBuffer, options)) {

        LOGE("Failed to read from data source");

        outputBuffer->release();

        mInputBuffer->release();

        mInputBuffer = NULL;

        return UNKNOWN_ERROR;

    }