diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 01:22:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-09 01:22:05 +0000 |
| commit | d1aeff5597785336af3bba34cfddb0ebbc6b2397 (patch) | |
| tree | 1aa283b82f707311e6c8ff6a5df1f59425cab5d9 /media/libstagefright/codecs/amrnb/common/src/div_s.cpp | |
| parent | 66172f5cd25d1ce05870be70ad4f5fc0af6289f0 (diff) | |
| parent | 2d0ac425564ff9882ebaac5267d1a04d4af67d00 (diff) | |
| download | frameworks_av-d1aeff5597785336af3bba34cfddb0ebbc6b2397.zip frameworks_av-d1aeff5597785336af3bba34cfddb0ebbc6b2397.tar.gz frameworks_av-d1aeff5597785336af3bba34cfddb0ebbc6b2397.tar.bz2 | |
Merge "Fix build with clang in C++11 mode"
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/src/div_s.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/src/div_s.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/div_s.cpp b/media/libstagefright/codecs/amrnb/common/src/div_s.cpp index f3bed7e..14d30c5 100644 --- a/media/libstagefright/codecs/amrnb/common/src/div_s.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/div_s.cpp @@ -207,13 +207,13 @@ Word16 div_s (Word16 var1, Word16 var2) /*---------------------------------------------------------------------------- ; FUNCTION CODE ----------------------------------------------------------------------------*/ -Word16 div_s(register Word16 var1, register Word16 var2) +Word16 div_s(Word16 var1, Word16 var2) { /*---------------------------------------------------------------------------- ; Define all local variables ----------------------------------------------------------------------------*/ Word16 var_out = 0; - register Word16 iteration; + Word16 iteration; Word32 L_num; Word32 L_denom; Word32 L_denom_by_2; |