diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:07:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:07:36 -0800 |
| commit | 67caa6dfef0b98235616102eb5c503f84782bbed (patch) | |
| tree | 8462b314f96873ccce6a0169c292ab3df8046281 /media/libstagefright | |
| parent | c6531cfdf04db7f75de3fe82697149f6e28b94e1 (diff) | |
| parent | 9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9 (diff) | |
| download | frameworks_av-67caa6dfef0b98235616102eb5c503f84782bbed.zip frameworks_av-67caa6dfef0b98235616102eb5c503f84782bbed.tar.gz frameworks_av-67caa6dfef0b98235616102eb5c503f84782bbed.tar.bz2 | |
am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
stagefright amrwb: Change a C++ style cast into a C style cast
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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)); } |