---

yaml --- r: 349031 b: refs/heads/master c: ac706bf h: refs/heads/master i: 349029: 0702d1e 349027: 4057b93 349023: c9057ab v: v3
git-mirror · Jan 6, 2013 · 00dcf48 · 00dcf48
1 parent 6bdf069
commit 00dcf48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9699088e4bfaff1778d26192756a5894c3f947b
+refs/heads/master: ac706bf75cb99b91bf2792c52ab5b2e4b94560a1
diff --git a/trunk/drivers/media/v4l2-core/videobuf2-core.c b/trunk/drivers/media/v4l2-core/videobuf2-core.c
@@ -921,8 +921,10 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
 		 * In videobuf we use our internal V4l2_planes struct for
 		 * single-planar buffers as well, for simplicity.
 		 */
-		if (V4L2_TYPE_IS_OUTPUT(b->type))
+		if (V4L2_TYPE_IS_OUTPUT(b->type)) {
 			v4l2_planes[0].bytesused = b->bytesused;
+			v4l2_planes[0].data_offset = 0;
+		}
 
 		if (b->memory == V4L2_MEMORY_USERPTR) {
 			v4l2_planes[0].m.userptr = b->m.userptr;