From cf54da04a403124c5faa465ff40adcabd01a1028 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 15 Mar 2013 16:35:28 -0300 Subject: [PATCH] --- yaml --- r: 366843 b: refs/heads/master c: 69996873478d75381d14abbc9e768cc38d82e94b h: refs/heads/master i: 366841: 93e50712058e46266a9b1e55d03875445e3755da 366839: 4c890dd13605b697b724ff9966010fca16279a3d v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/solo6x10/v4l2-enc.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9b287cf05321..92bdfaa5ce4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15513c12e3c5f5e7c683865b3e019cf90babab8f +refs/heads/master: 69996873478d75381d14abbc9e768cc38d82e94b diff --git a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c index 4fbfb351d373..0efb6237f685 100644 --- a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c +++ b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c @@ -860,8 +860,16 @@ static int solo_enc_set_fmt_cap(struct file *file, void *priv, /* This does not change the encoder at all */ solo_enc->fmt = pix->pixelformat; + /* + * More information is needed about these 'extended' types. As far + * as I can tell these are basically additional video streams with + * different MPEG encoding attributes that can run in parallel with + * the main stream. If so, then this should be implemented as a + * second video node. Abusing priv like this is certainly not the + * right approach. if (pix->priv) solo_enc->type = SOLO_ENC_TYPE_EXT; + */ return 0; }