Attachment #589900 for bug #694476

View | Details | Raw Unified | Return to bug 694476
Collapse All | Expand All

Lines 5-10 Link Here

(-)a/NEWS.md (+4 lines)
5	* mkvmerge: mkvmerge now allows appending AV1, VP8, VP9, h.264/AVC and	5	* mkvmerge: mkvmerge now allows appending AV1, VP8, VP9, h.264/AVC and
6	h.265/HEVC tracks whose pixel dimensions differ. Implements #2582.	6	h.265/HEVC tracks whose pixel dimensions differ. Implements #2582.
7		7
		8	## Bug fixes
		9
		10	* source code: fixed building with Boost 1.71.0. Fixes #2599.
		11
8		12
9	# Version 35.0.0 "All The Love In The World" 2019-06-22	13	# Version 35.0.0 "All The Love In The World" 2019-06-22
10		14

Lines 29-35 inline std::vector<std::string> Link Here

(-)a/src/common/strings/editing.h (-2 / +1 lines)
29	split(std::string const &text,	29	split(std::string const &text,
30	std::string const &pattern = ",",	30	std::string const &pattern = ",",
31	size_t max = 0) {	31	size_t max = 0) {
32	return split(text, boost::regex("\\Q"s + pattern, boost::regex::perl), max);	32	return ::split(text, boost::regex("\\Q"s + pattern, boost::regex::perl), max);
33	}	33	}
34		34
35	void strip(std::string &s, bool newlines = false);	35	void strip(std::string &s, bool newlines = false);
36	-

Return to bug 694476