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

williamsheet · Feb 27, 2012 · 695cfe1 · 695cfe1
2 parents f7f1280 + ab01498
commit 695cfe1
Showing 1 changed file with 1 addition and 1 deletion.
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));
 }