diff -Nru v4l-utils-1.6.99+r2852/debian/bzr-builder.manifest v4l-utils-1.6.99+r2853/debian/bzr-builder.manifest
--- v4l-utils-1.6.99+r2852/debian/bzr-builder.manifest	2015-07-17 14:02:43.000000000 +0000
+++ v4l-utils-1.6.99+r2853/debian/bzr-builder.manifest	2015-07-20 14:02:52.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}+r2852-68
-lp:libv4l revid:git-v1:11adf49a3b565fedd20f5a57bc2dd293d3b386a3
+# bzr-builder format 0.3 deb-version {debupstream}+r2853-68
+lp:libv4l revid:git-v1:6ae02e44e0f43aeaaf3a031fccb9446bf57b65bb
 nest packaging lp:~libv4l/+junk/packaging debian revid:gjasny@googlemail.com-20141216192255-a59v89g81ufhr0z6
diff -Nru v4l-utils-1.6.99+r2852/debian/changelog v4l-utils-1.6.99+r2853/debian/changelog
--- v4l-utils-1.6.99+r2852/debian/changelog	2015-07-17 14:02:43.000000000 +0000
+++ v4l-utils-1.6.99+r2853/debian/changelog	2015-07-20 14:02:52.000000000 +0000
@@ -1,8 +1,8 @@
-v4l-utils (1.6.99+r2852-68~ubuntu14.10.1) utopic; urgency=low
+v4l-utils (1.6.99+r2853-68~ubuntu14.10.1) utopic; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Fri, 17 Jul 2015 14:02:43 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Mon, 20 Jul 2015 14:02:52 +0000
 
 v4l-utils (1.6.99-1) unstable; urgency=medium
 
diff -Nru v4l-utils-1.6.99+r2852/.pc/.quilt_patches v4l-utils-1.6.99+r2853/.pc/.quilt_patches
--- v4l-utils-1.6.99+r2852/.pc/.quilt_patches	2015-07-17 14:02:43.000000000 +0000
+++ v4l-utils-1.6.99+r2853/.pc/.quilt_patches	2015-07-20 14:02:55.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-957299/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.6.99+r2852/debian/patches
+/home/buildd/build-RECIPEBRANCHBUILD-958785/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.6.99+r2853/debian/patches
diff -Nru v4l-utils-1.6.99+r2852/.pc/.quilt_series v4l-utils-1.6.99+r2853/.pc/.quilt_series
--- v4l-utils-1.6.99+r2852/.pc/.quilt_series	2015-07-17 14:02:43.000000000 +0000
+++ v4l-utils-1.6.99+r2853/.pc/.quilt_series	2015-07-20 14:02:55.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-957299/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.6.99+r2852/debian/patches/series
+/home/buildd/build-RECIPEBRANCHBUILD-958785/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.6.99+r2853/debian/patches/series
diff -Nru v4l-utils-1.6.99+r2852/utils/v4l2-compliance/v4l2-test-buffers.cpp v4l-utils-1.6.99+r2853/utils/v4l2-compliance/v4l2-test-buffers.cpp
--- v4l-utils-1.6.99+r2852/utils/v4l2-compliance/v4l2-test-buffers.cpp	2015-07-17 14:02:41.000000000 +0000
+++ v4l-utils-1.6.99+r2853/utils/v4l2-compliance/v4l2-test-buffers.cpp	2015-07-20 14:02:50.000000000 +0000
@@ -132,8 +132,10 @@
 	{
 		return node->querybuf(*this, index);
 	}
-	int prepare_buf(node *node)
+	int prepare_buf(node *node, bool fill_bytesused = true)
 	{
+		if (v4l_type_is_output(g_type()))
+			fill_output_buf(fill_bytesused);
 		return node->prepare_buf(*this);
 	}
 	int dqbuf(node *node)
@@ -786,7 +788,7 @@
 		buf.s_bytesused(buf.g_length(p) + 1, p);
 		buf.s_data_offset(0, p);
 	}
-	ret = buf.prepare_buf(node);
+	ret = buf.prepare_buf(node, false);
 	fail_on_test(ret != EINVAL && ret != ENOTTY);
 	have_prepare = ret != ENOTTY;
 	fail_on_test(buf.qbuf(node, false) != EINVAL);
@@ -797,16 +799,16 @@
 			buf.s_data_offset(buf.g_bytesused(p), p);
 		}
 		if (have_prepare)
-			fail_on_test(buf.prepare_buf(node) != EINVAL);
+			fail_on_test(buf.prepare_buf(node, false) != EINVAL);
 		fail_on_test(buf.qbuf(node, false) != EINVAL);
 	}
 	buf.init(orig_buf);
 	for (unsigned p = 0; p < buf.g_num_planes(); p++) {
-		buf.s_bytesused(0, p);
+		buf.s_bytesused(buf.g_length(p), p);
 		buf.s_data_offset(0, p);
 	}
 	if (have_prepare) {
-		fail_on_test(buf.prepare_buf(node));
+		fail_on_test(buf.prepare_buf(node, false));
 		fail_on_test(buf.check(Prepared, 0));
 		buf.init(orig_buf);
 		for (unsigned p = 0; p < buf.g_num_planes(); p++) {