commit e52ddcd337b793966c2b343dab3e2df8ea0542ae
author Xin Li <delphij@google.com> Mon Mar 11 09:38:51 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 11 09:38:51 2019 -0700
tree 0b58550f74bc8eb4e4236ec6c6f63010c5945e47
parent 48f7ad9389a9c9024a302d39b53636284873c011
parent fa5ead07ba1ddb9cbe179b9fab2a28ecc929cd5c

[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
am: fa5ead07ba -s ours
am skip reason: subject contains skip directive

Change-Id: I509110e6d59eea178c8a17c310fc9e8c24d69c8f

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();