summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrnb
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-02-28 07:19:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-28 07:19:40 -0800
commit3f791be1032e6c4cc499598dd2be116db6fb33c3 (patch)
treefc6bb2f9080becaae931ac78d8d32eb6f6585ff0 /media/libstagefright/codecs/amrnb
parentcfbd62616ab2b12f0fee603658f04e5827cc7f8f (diff)
parent279612dd95acc127e41b8a7aa3277f3ffacaa849 (diff)
downloadframeworks_av-3f791be1032e6c4cc499598dd2be116db6fb33c3.zip
frameworks_av-3f791be1032e6c4cc499598dd2be116db6fb33c3.tar.gz
frameworks_av-3f791be1032e6c4cc499598dd2be116db6fb33c3.tar.bz2
am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58': stagefright amr: Avoid C++/C99 for loops with variable declaration
Diffstat (limited to 'media/libstagefright/codecs/amrnb')
-rw-r--r--media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp b/media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
index 3c4494d..455a510 100644
--- a/media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
+++ b/media/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
@@ -791,7 +791,8 @@ void update_gp_clipping(tonStabState *st, /* i/o : State struct */
)
{
OSCL_UNUSED_ARG(pOverflow);
- for (int i = 0; i < N_FRAME - 1; i++)
+ int i;
+ for (i = 0; i < N_FRAME - 1; i++)
{
st->gp[i] = st->gp[i+1];
}