Merge "RTSP: append track URL to base URL" into mnc-dev (70c75d8c) · Commits · e / os / android_frameworks_av

media/libstagefright/rtsp/MyHandler.h

+3 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1673,21 +1673,11 @@ private:
	}		}

	size_t n = strlen(baseURL);		size_t n = strlen(baseURL);
	if (baseURL[n - 1] == '/') {
	out->setTo(baseURL);		out->setTo(baseURL);
	out->append(url);		if (baseURL[n - 1] != '/') {
	} else {
	const char *slashPos = strrchr(baseURL, '/');

	if (slashPos > &baseURL[6]) {
	out->setTo(baseURL, slashPos - baseURL);
	} else {
	out->setTo(baseURL);
	}

	out->append("/");		out->append("/");
	out->append(url);
	}		}
			out->append(url);

	return true;		return true;
	}		}