On Mon, Aug 04, 2014 at 11:19:03AM +0200, Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@xxxxxxxxx> > > Note: the revision text for the v4l2_pix_format change from Laurent > erroneously mentioned 3.16 when it only got merged for 3.17. Fixed > that as well. > > Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> > --- > Documentation/DocBook/media/v4l/compat.xml | 24 ++++++++++++++++++++++++ > Documentation/DocBook/media/v4l/v4l2.xml | 11 ++++++----- > 2 files changed, 30 insertions(+), 5 deletions(-) > > diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml > index eee6f0f..3a626d1 100644 > --- a/Documentation/DocBook/media/v4l/compat.xml > +++ b/Documentation/DocBook/media/v4l/compat.xml > @@ -2545,6 +2545,30 @@ fields changed from _s32 to _u32. > </orderedlist> > </section> > > + <section> > + <title>V4L2 in Linux 3.16</title> > + <orderedlist> > + <listitem> > + <para>Added event V4L2_EVENT_SOURCE_CHANGE. > + </para> > + </listitem> > + </orderedlist> > + </section> > + > + <section> > + <title>V4L2 in Linux 3.17</title> > + <orderedlist> > + <listitem> > + <para>Extended &v4l2-pix-format;. Added format flags. > + </para> > + </listitem> > + <listitem> > + <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;. > + </para> > + </listitem> > + </orderedlist> > + </section> > + > <section id="other"> > <title>Relation of V4L2 to other Linux multimedia APIs</title> > > diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml > index f2f81f0..7cfe618 100644 > --- a/Documentation/DocBook/media/v4l/v4l2.xml > +++ b/Documentation/DocBook/media/v4l/v4l2.xml > @@ -152,10 +152,11 @@ structs, ioctls) must be noted in more detail in the history chapter > applications. --> > > <revision> > - <revnumber>3.16</revnumber> > - <date>2014-05-27</date> > - <authorinitials>lp</authorinitials> > - <revremark>Extended &v4l2-pix-format;. Added format flags. > + <revnumber>3.17</revnumber> > + <date>2014-08-04</date> > + <authorinitials>lp, hv</authorinitials> > + <revremark>Extended &v4l2-pix-format;. Added format flags. Added compound control types Shouldn't 3.16 and 3.17 still have separate entries, or did the first two changes make it to 3.17 only? With the above considered, for both: Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > +and VIDIOC_QUERY_EXT_CTRL. > </revremark> > </revision> > -- Kind regards, Sakari Ailus e-mail: sakari.ailus@xxxxxx XMPP: sailus@xxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html