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/autocorr.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/autocorr.cpp')
-rw-r--r-- | media/libstagefright/codecs/amrnb/enc/src/autocorr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/amrnb/enc/src/autocorr.cpp b/media/libstagefright/codecs/amrnb/enc/src/autocorr.cpp index 0d3acac..c71811d 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/autocorr.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/autocorr.cpp @@ -306,9 +306,9 @@ Word16 Autocorr( Flag *pOverflow /* (o) : indicates overflow */ ) { - register Word16 i; - register Word16 j; - register Word16 norm; + Word16 i; + Word16 j; + Word16 norm; Word16 y[L_WINDOW]; Word32 sum; |