Commit 8362149a authored Jul 31, 2020 by Treehugger Robot Committed by Automerger Merge Worker Jul 31, 2020

Merge "omx: Update language to comply with Android's inclusive language...

Merge "omx: Update language to comply with Android's inclusive language guidance" am: c58f753d am: 0e0a7fd9 am: 2abad630 am: 5bb23a58 am: f06c51e1

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1381843

Change-Id: I4a9ed809360f2fe111c45fb2c5a0484d7507c31a

media/libstagefright/omx/OMXUtils.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ bool IsFlexibleColorFormat(
		DescribeColorFormat2Params describeParams;
		InitOMXParams(&describeParams);
		describeParams.eColorFormat = (OMX_COLOR_FORMATTYPE)colorFormat;
		// reasonable dummy values
		// reasonable initial values (that will be overwritten)
		describeParams.nFrameWidth = 128;
		describeParams.nFrameHeight = 128;
		describeParams.nStride = 128;