From ae3222951cddfd41c9ee8332a91f5236bd6cfda1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 31 Aug 2012 09:18:04 -0300 Subject: [PATCH] --- yaml --- r: 331018 b: refs/heads/master c: 961ae44980034f82d037c982e5b2f8258e055d63 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-mem2mem.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d8bc733c650..be8e7052e515 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36aee5ff9098a871bda38dbbdad40ad59f6535cf +refs/heads/master: 961ae44980034f82d037c982e5b2f8258e055d63 diff --git a/trunk/include/media/v4l2-mem2mem.h b/trunk/include/media/v4l2-mem2mem.h index 16ac4733e80d..131cc4a53675 100644 --- a/trunk/include/media/v4l2-mem2mem.h +++ b/trunk/include/media/v4l2-mem2mem.h @@ -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; } /** @@ -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);