diff options
| author | Martin Storsjo <martin@martin.st> | 2011-05-18 12:24:11 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-02-24 23:01:24 +0200 |
| commit | ffa34edd0fd50d558f9bc7a650d959b4d3d29123 (patch) | |
| tree | 692cde8d3155348e5a156089165141ec7f929f68 /media | |
| parent | b86b3c8f976b70635770d93217132d4023ecf33f (diff) | |
| download | frameworks_av-ffa34edd0fd50d558f9bc7a650d959b4d3d29123.zip frameworks_av-ffa34edd0fd50d558f9bc7a650d959b4d3d29123.tar.gz frameworks_av-ffa34edd0fd50d558f9bc7a650d959b4d3d29123.tar.bz2 | |
stagefright amrwb: Change a C++ style cast into a C style cast
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C (except for this
cast).
This was committed on the master branch of the opencore
repository in commit ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b,
based on AOSP contribution 10014.
Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
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)); } |