aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-03-15 15:35:28 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-25 07:50:22 -0400
commit69996873478d75381d14abbc9e768cc38d82e94b (patch)
tree5e45ea3bf001bd492bc4b0d75d574a78c49cc2dc
parent15513c12e3c5f5e7c683865b3e019cf90babab8f (diff)
[media] solo6x10: disable the 'priv' abuse
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/media/solo6x10/v4l2-enc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/staging/media/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c
index 4fbfb351d373..0efb6237f685 100644
--- a/drivers/staging/media/solo6x10/v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/v4l2-enc.c
@@ -860,8 +860,16 @@ static int solo_enc_set_fmt_cap(struct file *file, void *priv,
860 /* This does not change the encoder at all */ 860 /* This does not change the encoder at all */
861 solo_enc->fmt = pix->pixelformat; 861 solo_enc->fmt = pix->pixelformat;
862 862
863 /*
864 * More information is needed about these 'extended' types. As far
865 * as I can tell these are basically additional video streams with
866 * different MPEG encoding attributes that can run in parallel with
867 * the main stream. If so, then this should be implemented as a
868 * second video node. Abusing priv like this is certainly not the
869 * right approach.
863 if (pix->priv) 870 if (pix->priv)
864 solo_enc->type = SOLO_ENC_TYPE_EXT; 871 solo_enc->type = SOLO_ENC_TYPE_EXT;
872 */
865 return 0; 873 return 0;
866} 874}
867 875