commit 85beebd2323bf7aed03bde5965e397fbfea08381
author Xin Li <delphij@google.com> Tue Mar 12 22:52:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 12 22:52:38 2019 -0700
tree 97d01ef0fcd5597d9d6be837209a24a5cb2923e2
parent d3111a8b5f3b2f1001e13d52e46e8dc2d0e1c337
parent 9e33f3a435628d764e14e9300280d5a183272aea

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

Change-Id: Icfd34857e3da55ae3fff914d3bd4f0f725fd3ed2

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