Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331018
b: refs/heads/master
c: 961ae44
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer authored and Mauro Carvalho Chehab committed Sep 18, 2012
1 parent 2a9b7c4 commit ae32229
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 36aee5ff9098a871bda38dbbdad40ad59f6535cf
refs/heads/master: 961ae44980034f82d037c982e5b2f8258e055d63
4 changes: 2 additions & 2 deletions trunk/include/media/v4l2-mem2mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb);
static inline
unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
{
return m2m_ctx->cap_q_ctx.num_rdy;
return m2m_ctx->out_q_ctx.num_rdy;
}

/**
Expand All @@ -150,7 +150,7 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
static inline
unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)
{
return m2m_ctx->out_q_ctx.num_rdy;
return m2m_ctx->cap_q_ctx.num_rdy;
}

void *v4l2_m2m_next_buf(struct v4l2_m2m_queue_ctx *q_ctx);
Expand Down

0 comments on commit ae32229

Please sign in to comment.