commit 1f8749f27d4450c19952403a91362df3d20b972d
author Chad Brubaker <cbrubaker@google.com> Wed Sep 23 19:29:42 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 23 19:29:42 2015 +0000
tree 4d15f494e0aed5dc69f0957644838aaf85d62810
parent 7cac3edc679c9d3f88268c2f5a83cba1333e20e5
parent 0d9f5a1243616da9d2de49753b37957920a50812

Merge changes I6b9963d0,Ia4537f5b,I9e018974

* changes:
  Enable integer overflow detection in libmedia
  Fix benign overflow in ClientProxy::getMisalignment
  Fix benign unsigned overflow in AudioTrack

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 86639cb..76788f0 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1495,7 +1495,7 @@
         format->setInt32("width", mVideoWidth);
         format->setInt32("height", mVideoHeight);
         format->setInt32("stride", mVideoWidth);
-        format->setInt32("slice-height", mVideoWidth);
+        format->setInt32("slice-height", mVideoHeight);
         format->setInt32("color-format", OMX_COLOR_FormatAndroidOpaque);
 
         // set up time lapse/slow motion for surface source