commit 90a970a1680cf42fcd3da54d5c07b24a16ab391a
author Peter Collingbourne <pcc@google.com> Tue Mar 19 14:08:52 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 14:08:52 2019 -0700
tree 73bdaa7e35cb3c2777ef507a1dca76e7bf02f24e
parent d11a5ab1a7e02516a7230ce4b2d0b906cd4d022d
parent e8fde3739f2f5ea1d163d6202c1d3dba8b1c70d8

Merge "Switch from getrlimit(RLIMIT_AS) to android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES)." am: e3a7f1b680
am: e8fde3739f

Change-Id: Iaa82a564793437bbf6ac73435469072e533bdaf4

media/libstagefright/rtsp/APacketSource.cpp

diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp
index b964bc0..1aa8a20 100644
--- a/media/libstagefright/rtsp/APacketSource.cpp
+++ b/media/libstagefright/rtsp/APacketSource.cpp
@@ -376,8 +376,8 @@
     ALOGI("VOL dimensions = %dx%d", *width, *height);
 
     size_t len1 = config->size() + GetSizeWidth(config->size()) + 1;
-    size_t len2 = len1 + GetSizeWidth(len1) + 1 + 13;
-    size_t len3 = len2 + GetSizeWidth(len2) + 1 + 3;
+    size_t len2 = len1 + GetSizeWidth(len1 + 13) + 1 + 13;
+    size_t len3 = len2 + GetSizeWidth(len2 + 3) + 1 + 3;
 
     sp<ABuffer> csd = new ABuffer(len3);
     uint8_t *dst = csd->data();