summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof HaƂasa2013-10-07 13:33:55 +0200
committerMauro Carvalho Chehab2013-10-17 10:50:00 +0200
commitcfd736adf68a2efcc069f3bd2b5ba545fd5d020c (patch)
tree4c03ee8ef804ea39613ee3864507e7f754075839
parent[media] tlg2300: fix sparse warning (diff)
downloadkernel-qcow2-linux-cfd736adf68a2efcc069f3bd2b5ba545fd5d020c.tar.gz
kernel-qcow2-linux-cfd736adf68a2efcc069f3bd2b5ba545fd5d020c.tar.xz
kernel-qcow2-linux-cfd736adf68a2efcc069f3bd2b5ba545fd5d020c.zip
[media] SOLO6x10: Fix video frame type (I/P/B)
Mask v4l2_buf.flags to indicate only I/P/B frames. Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
index 51200a3e4bd7..d582c5b84c14 100644
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
@@ -506,6 +506,7 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
return -EIO;
/* If this is a key frame, add extra header */
+ vb->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME);
if (!vop_type(vh)) {
skip = solo_enc->vop_len;
vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;