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

Jean-Baptiste Queru · Android Git Automerger · commit ded8e6818dbe · 2012-02-27T13:07:36.000-08:00
* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
  stagefright amrwb: Change a C++ style cast into a C style cast
diff --git a/media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp b/media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
@@ -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));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,6 @@ int16 AmrWbInterpol( /* return result of interpolation */`
`337`	`337`
`338`	`338`	`L_sum = shl_int32(L_sum, 2); /* saturation can occur here */`
`339`	`339`
`340`		`- return ((int16(L_sum >> 16)));`
	`340`	`+ return ((int16)(L_sum >> 16));`
`341`	`341`	`}`
`342`	`342`