Merge "Adding a configure flag to control WebM container support"

author Vignesh Venkatasubramanian <vigneshv@google.com>

Mon, 17 Mar 2014 17:06:49 +0000 (10:06 -0700)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Mon, 17 Mar 2014 17:06:49 +0000 (10:06 -0700)
author Vignesh Venkatasubramanian <vigneshv@google.com>
Mon, 17 Mar 2014 17:06:49 +0000 (10:06 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 17 Mar 2014 17:06:49 +0000 (10:06 -0700)
diff --cc configure
Simple merge
diff --cc examples.mk
Simple merge
author	Vignesh Venkatasubramanian <vigneshv@google.com>
	Mon, 17 Mar 2014 17:06:49 +0000 (10:06 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Mon, 17 Mar 2014 17:06:49 +0000 (10:06 -0700)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
examples.mk	patch \|	diff1 \|	diff2 \|	blob \| history