diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 12:13:26 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-27 12:13:27 -0800 |
| commit | 9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9 (patch) | |
| tree | 108639a7637c4a4b3bd2c798c597bc36a6b96cce /media | |
| parent | fbaf72b701316c8050d73690ff387e62f724f216 (diff) | |
| parent | ffa34edd0fd50d558f9bc7a650d959b4d3d29123 (diff) | |
| download | frameworks_av-9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9.zip frameworks_av-9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9.tar.gz frameworks_av-9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9.tar.bz2 | |
Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
Diffstat (limited to 'media')
| -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)); } |