[automerger] Reserve enough space for RTSP CSD am: c025be8ce5 am: 0e201db242 am: b3854525d1 am: 0f33fc35ea am: 81f909cdd7 am: 6b7b14ad4c am: b8ecdb9b57

am: 85dcd68ebc

Change-Id: Iae1cb3e35054c710bbef416fa7ed58b56548c4b4

media/libstagefright/rtsp/APacketSource.cpp

@@ -376,8 +376,8 @@ static sp<ABuffer> MakeMPEG4VideoCodecSpecificData(
     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();