Merge "Revert "Revert "Add support for setting byte alignment."""

author Frank Galligan <fgalligan@google.com>

Tue, 16 Dec 2014 23:14:17 +0000 (15:14 -0800)

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

Tue, 16 Dec 2014 23:14:17 +0000 (15:14 -0800)
author Frank Galligan <fgalligan@google.com>
Tue, 16 Dec 2014 23:14:17 +0000 (15:14 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 16 Dec 2014 23:14:17 +0000 (15:14 -0800)
diff --cc vp9/common/vp9_postproc.c
Simple merge
diff --cc vp9/decoder/vp9_decodeframe.c
Simple merge
author	Frank Galligan <fgalligan@google.com>
	Tue, 16 Dec 2014 23:14:17 +0000 (15:14 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 16 Dec 2014 23:14:17 +0000 (15:14 -0800)
		1	2
vp9/common/vp9_postproc.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/decoder/vp9_decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history