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/convolve.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/convolve.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/enc/src/convolve.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/enc/src/convolve.cpp b/media/libstagefright/codecs/amrnb/enc/src/convolve.cpp index e9ce7ba..5015a4a 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/convolve.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/convolve.cpp @@ -212,7 +212,7 @@ void Convolve( Word16 L /* (i) : vector size */ ) { - register Word16 i, n; + Word16 i, n; Word32 s1, s2; |