From bdfd70e74b37af7fe56737be2a474d05661ed47a Mon Sep 17 00:00:00 2001 From: Nicolas THERY Date: Fri, 26 Oct 2012 09:01:55 -0300 Subject: [PATCH] --- yaml --- r: 357003 b: refs/heads/master c: f818b358dc94c845490dfc8a9771492e5311fe9e h: refs/heads/master i: 357001: afec88b083b415dca43bf06ab445e1a596659f98 356999: 42363e23286137fd69207a878524ae6f61622cb8 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/v4l2-framework.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c013811b79cf..14f11eedab18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3408d886173ff57c91bdeda9c3c35c62b5fac1be +refs/heads/master: f818b358dc94c845490dfc8a9771492e5311fe9e diff --git a/trunk/Documentation/video4linux/v4l2-framework.txt b/trunk/Documentation/video4linux/v4l2-framework.txt index 32bfe926e8d7..0a1ef671c9d4 100644 --- a/trunk/Documentation/video4linux/v4l2-framework.txt +++ b/trunk/Documentation/video4linux/v4l2-framework.txt @@ -68,8 +68,7 @@ Structure of the framework The framework closely resembles the driver structure: it has a v4l2_device struct for the device instance data, a v4l2_subdev struct to refer to sub-device instances, the video_device struct stores V4L2 device node data -and in the future a v4l2_fh struct will keep track of filehandle instances -(this is not yet implemented). +and the v4l2_fh struct keeps track of filehandle instances. The V4L2 framework also optionally integrates with the media framework. If a driver sets the struct v4l2_device mdev field, sub-devices and video nodes