diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-06-23 14:03:58 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-06-23 15:05:10 +0200 |
| commit | 55e34d5bf9fd5ca8f1febb234276f8b6e9e46f06 (patch) | |
| tree | d82025121c639daeefb04ce48c0a26fcdcae4157 /Documentation/userspace-api/media | |
| parent | d09382777e9ad3d6a1b369ff29785250f620b544 (diff) | |
| download | linux-55e34d5bf9fd5ca8f1febb234276f8b6e9e46f06.tar.gz linux-55e34d5bf9fd5ca8f1febb234276f8b6e9e46f06.tar.bz2 linux-55e34d5bf9fd5ca8f1febb234276f8b6e9e46f06.zip | |
media: dev-encoder.rst: add GFDL-1-1+ to SPDX header
The media documents under the uAPI should be GFDL compatible.
So, make this one dual-licensed GPL-2.0 or GFDL-1.1+ with
no-invariant sections.
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'Documentation/userspace-api/media')
| -rw-r--r-- | Documentation/userspace-api/media/v4l/dev-encoder.rst | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/Documentation/userspace-api/media/v4l/dev-encoder.rst b/Documentation/userspace-api/media/v4l/dev-encoder.rst index c3a21bfe0052..fb44f20924de 100644 --- a/Documentation/userspace-api/media/v4l/dev-encoder.rst +++ b/Documentation/userspace-api/media/v4l/dev-encoder.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this +.. dual licensing only applies to this file, and not this project as a +.. whole. +.. +.. a) This file is free software; you can redistribute it and/or +.. modify it under the terms of the GNU General Public License as +.. published by the Free Software Foundation version 2 of +.. the License. +.. +.. This file is distributed in the hope that it will be useful, +.. but WITHOUT ANY WARRANTY; without even the implied warranty of +.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. GNU General Public License for more details. +.. +.. Or, alternatively, +.. +.. b) Permission is granted to copy, distribute and/or modify this +.. document under the terms of the GNU Free Documentation License, +.. Version 1.1 or any later version published by the Free Software +.. Foundation, with no Invariant Sections, no Front-Cover Texts +.. and no Back-Cover Texts. A copy of the license is included at +.. Documentation/userspace-api/media/fdl-appendix.rst. +.. +.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections .. _encoder: |