commit d3111a8b5f3b2f1001e13d52e46e8dc2d0e1c337
author Xin Li <delphij@google.com> Tue Mar 12 22:29:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 12 22:29:47 2019 -0700
tree 97d01ef0fcd5597d9d6be837209a24a5cb2923e2
parent be55e0a1df9d80ecdb5a6a3353dce54aff1547d9
parent 55b301db260de5c0089a1f6912c75ec5f5f85f3a

[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 628286b620 -s ours
am: 55b301db26 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd5604c6096a5f7b0015b3abe3c95c55c9e9d89f

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