Effect masses and non-parabolicity in GaxIn1-xAs