Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev (9353b051) · Commits · e / os / android_frameworks_av

media/libstagefright/httplive/M3UParser.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -233,7 +233,11 @@ bool M3UParser::MediaGroup::getActiveURI(AString uri, const char baseURL) cons
		if (mSelectedIndex >= 0 && i == (size_t)mSelectedIndex) {
		const Media &item = mMediaItems.itemAt(i);

		if (item.mURI.empty()) {
		*uri = "";
		} else {
		*uri = item.makeURL(baseURL);
		}
		return true;
		}
		}
		@@ -464,7 +468,7 @@ bool M3UParser::getTypeURI(size_t index, const char key, AString uri) const {
		}

		if ((*uri).empty()) {
		*uri = mItems.itemAt(index).mURI;
		*uri = mItems.itemAt(index).makeURL(mBaseURI.c_str());
		}
		}