Commit 040c5b2c authored Feb 27, 2012 by Jean-Baptiste Queru Committed by Android Git Automerger Feb 27, 2012

am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"

* commit 'ded8e681':
  stagefright amrwb: Change a C++ style cast into a C style cast

media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -337,6 +337,6 @@ int16 AmrWbInterpol( /* return result of interpolation */

		L_sum = shl_int32(L_sum, 2); /* saturation can occur here */

		return ((int16(L_sum >> 16)));
		return ((int16)(L_sum >> 16));
		}