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/enc/src/dtx_enc.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/enc/src/dtx_enc.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/enc/src/dtx_enc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/amrnb/enc/src/dtx_enc.cpp b/media/libstagefright/codecs/amrnb/enc/src/dtx_enc.cpp index 276e590..2ccb777 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/dtx_enc.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/dtx_enc.cpp @@ -130,7 +130,7 @@ terms listed above has been obtained from the copyright holder. ; MACROS ; Define module specific macros here ----------------------------------------------------------------------------*/ -extern Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow); +extern Word32 L_add(Word32 L_var1, Word32 L_var2, Flag *pOverflow); /*---------------------------------------------------------------------------- ; DEFINES @@ -671,7 +671,7 @@ void dtx_enc(dtx_encState *st, /* i/o : State struct */ Flag *pOverflow /* i/o : overflow indicator */ ) { - register Word16 i, j; + Word16 i, j; Word16 temp; Word16 log_en; Word16 lsf[M]; @@ -943,7 +943,7 @@ void dtx_buffer(dtx_encState *st, /* i/o : State struct */ ) { - register Word16 i; + Word16 i; Word32 L_frame_en; Word32 L_temp; Word16 log_en_e; |