Merge "vp9: fix -Wclobbered (longjmp + local variables)"

author James Zern <jzern@google.com>

Thu, 8 Jan 2015 23:53:02 +0000 (15:53 -0800)

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

Thu, 8 Jan 2015 23:53:02 +0000 (15:53 -0800)
author James Zern <jzern@google.com>
Thu, 8 Jan 2015 23:53:02 +0000 (15:53 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 8 Jan 2015 23:53:02 +0000 (15:53 -0800)
diff --cc vp9/decoder/vp9_decoder.c
Simple merge
diff --cc vp9/encoder/vp9_encoder.c
Simple merge
author	James Zern <jzern@google.com>
	Thu, 8 Jan 2015 23:53:02 +0000 (15:53 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 8 Jan 2015 23:53:02 +0000 (15:53 -0800)
		1	2
vp9/decoder/vp9_decoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history