summaryrefslogtreecommitdiff
path: root/Documentation/media/uapi/v4l/biblio.rst
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-28 23:22:40 +0300
committerThomas Gleixner <tglx@linutronix.de>2019-07-28 23:22:40 +0300
commit7a30bdd99f37352b188575b27924c407c6ddff9e (patch)
tree10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /Documentation/media/uapi/v4l/biblio.rst
parentf36cf386e3fec258a341d446915862eded3e13d8 (diff)
parent609488bc979f99f805f34e9a32c1e3b71179d10b (diff)
downloadlinux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'Documentation/media/uapi/v4l/biblio.rst')
-rw-r--r--Documentation/media/uapi/v4l/biblio.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/media/uapi/v4l/biblio.rst b/Documentation/media/uapi/v4l/biblio.rst
index ec33768c055e..8f4eb8823d82 100644
--- a/Documentation/media/uapi/v4l/biblio.rst
+++ b/Documentation/media/uapi/v4l/biblio.rst
@@ -122,6 +122,15 @@ ITU BT.1119
:author: International Telecommunication Union (http://www.itu.ch)
+.. _h264:
+
+ITU-T Rec. H.264 Specification (04/2017 Edition)
+================================================
+
+:title: ITU-T Recommendation H.264 "Advanced Video Coding for Generic Audiovisual Services"
+
+:author: International Telecommunication Union (http://www.itu.ch)
+
.. _jfif:
JFIF