Merge "Bug fix: Handle input data ptr = NULL and size = 0 correctly"

author Marco Paniconi <marpan@google.com>

Fri, 25 Jan 2013 20:05:13 +0000 (12:05 -0800)

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

Fri, 25 Jan 2013 20:05:13 +0000 (12:05 -0800)
author Marco Paniconi <marpan@google.com>
Fri, 25 Jan 2013 20:05:13 +0000 (12:05 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 25 Jan 2013 20:05:13 +0000 (12:05 -0800)
diff --cc vp8/decoder/onyxd_if.c
Simple merge
diff --cc vp8/vp8_dx_iface.c
Simple merge
author	Marco Paniconi <marpan@google.com>
	Fri, 25 Jan 2013 20:05:13 +0000 (12:05 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 25 Jan 2013 20:05:13 +0000 (12:05 -0800)
		1	2
vp8/decoder/onyxd_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/vp8_dx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history