summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-03-31 16:59:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-03-31 16:59:32 +0000
commit7f822771dad5c9b9f03a70b44f094c80f5a71d2c (patch)
treeaba8ab1dea7aa001716835b712105f070ce6be89
parent1c03d6e0d67cb8d7e6a99dfeca39842d26f3277b (diff)
parent7a9e8dfebb30d9c864122b52c44d75692e3ad65b (diff)
Merge "mpeg4enc: fix OOB in RasterIntraUpdate" into rvc-qpr-dev
-rw-r--r--media/libstagefright/codecs/m4v_h263/enc/src/motion_est.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/motion_est.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/motion_est.cpp
index 997b78d229..9deb02367b 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/src/motion_est.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/src/motion_est.cpp
@@ -1576,7 +1576,7 @@ void RasterIntraUpdate(UChar *intraArray, UChar *Mode, Int totalMB, Int numRefre
/* find the last refresh MB */
indx = 0;
- while (intraArray[indx] == 1 && indx < totalMB)
+ while (indx < totalMB && intraArray[indx] == 1)
indx++;
/* add more */