Merge "Fix buffer leak in MPEG4Extractor"

        // Whole NAL units are returned but each fragment is prefixed by

        // the start code (0x00 00 00 01).

        ssize_t num_bytes_read = 0;

        if (mSrcBufferSize < size) {

        bool mSrcBufferFitsDataToRead = size <= mSrcBufferSize;

        if (mSrcBufferFitsDataToRead) {

          num_bytes_read = mDataSource->readAt(offset, mSrcBuffer, size);

        } else {

          // We are trying to read a sample larger than the expected max sample size.

          return AMEDIA_ERROR_MALFORMED;

          // Fall through and let the failure be handled by the following if.

        }

        num_bytes_read = mDataSource->readAt(offset, mSrcBuffer, size);

        if (num_bytes_read < (ssize_t)size) {

            mBuffer->release();

            mBuffer = NULL;

            return AMEDIA_ERROR_IO;

            return mSrcBufferFitsDataToRead ? AMEDIA_ERROR_IO : AMEDIA_ERROR_MALFORMED;

        }

        uint8_t *dstData = (uint8_t *)mBuffer->data();