| commit | 695cfe1e1e189f176fdf994f72d05a0129a66394 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 12:13:26 2012 -0800 |
| committer | android code review <noreply-gerritcodereview@google.com> | Mon Feb 27 12:13:27 2012 -0800 |
| tree | b3a6c1fb25b1da7c5bde17e0c4f8647779373850 | |
| parent | f7f1280e0c71d64098efb42b58a922d056164b5e [diff] | |
| parent | ab0149852b0d315633304856840bd0e8ae45af45 [diff] |
Merge "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 index 143c26e..f2ad333 100644 --- 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 @@ L_sum = shl_int32(L_sum, 2); /* saturation can occur here */ - return ((int16(L_sum >> 16))); + return ((int16)(L_sum >> 16)); }