summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/Makefile.sphinx3
-rw-r--r--Documentation/media/.gitignore1
-rw-r--r--Documentation/media/Makefile29
-rw-r--r--Documentation/media/intro.rst4
-rw-r--r--Documentation/media/media_api_files/typical_media_device.pdfbin52895 -> 0 bytes
-rw-r--r--Documentation/media/typical_media_device.svg (renamed from Documentation/media/media_api_files/typical_media_device.svg)0
-rw-r--r--Documentation/media/uapi/dvb/dvbstb.svg (renamed from Documentation/media/uapi/dvb/intro_files/dvbstb.svg)0
-rw-r--r--Documentation/media/uapi/dvb/intro.rst2
-rw-r--r--Documentation/media/uapi/dvb/intro_files/dvbstb.pdfbin1881 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/bayer.png (renamed from Documentation/media/uapi/v4l/subdev-formats_files/bayer.png)bin9725 -> 9725 bytes
-rw-r--r--Documentation/media/uapi/v4l/constraints.svg (renamed from Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg)0
-rw-r--r--Documentation/media/uapi/v4l/crop.png (renamed from Documentation/media/uapi/v4l/crop_files/crop.png)bin3334 -> 3334 bytes
-rw-r--r--Documentation/media/uapi/v4l/crop.rst4
-rw-r--r--Documentation/media/uapi/v4l/crop_files/crop.pdfbin5846 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-raw-vbi.rst12
-rw-r--r--Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdfbin3706 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdfbin3996 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdfbin7405 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-subdev.rst16
-rw-r--r--Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdfbin20276 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdfbin20729 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdfbin46311 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdfbin36714 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/field-order.rst8
-rw-r--r--Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdfbin9185 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdfbin9173 -> 0 bytes
-rw-r--r--Documentation/media/uapi/v4l/fieldseq_bt.png (renamed from Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png)bin12306 -> 12306 bytes
-rw-r--r--Documentation/media/uapi/v4l/fieldseq_tb.png (renamed from Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png)bin12247 -> 12247 bytes
-rw-r--r--Documentation/media/uapi/v4l/nv12mt.png (renamed from Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png)bin1920 -> 1920 bytes
-rw-r--r--Documentation/media/uapi/v4l/nv12mt_example.png (renamed from Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png)bin5261 -> 5261 bytes
-rw-r--r--Documentation/media/uapi/v4l/pipeline.png (renamed from Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png)bin12130 -> 12130 bytes
-rw-r--r--Documentation/media/uapi/v4l/pixfmt-nv12mt.rst4
-rw-r--r--Documentation/media/uapi/v4l/selection-api-003.rst2
-rw-r--r--Documentation/media/uapi/v4l/selection.png (renamed from Documentation/media/uapi/v4l/selection-api-003_files/selection.png)bin11716 -> 11716 bytes
-rw-r--r--Documentation/media/uapi/v4l/subdev-formats.rst4
-rw-r--r--Documentation/media/uapi/v4l/subdev-image-processing-crop.svg (renamed from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg)0
-rw-r--r--Documentation/media/uapi/v4l/subdev-image-processing-full.svg (renamed from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg)0
-rw-r--r--Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg (renamed from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg)0
-rw-r--r--Documentation/media/uapi/v4l/vbi_525.png (renamed from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png)bin2053 -> 2053 bytes
-rw-r--r--Documentation/media/uapi/v4l/vbi_625.png (renamed from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png)bin2352 -> 2352 bytes
-rw-r--r--Documentation/media/uapi/v4l/vbi_hsync.png (renamed from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png)bin906 -> 906 bytes
-rw-r--r--Documentation/media/uapi/v4l/vidioc-g-selection.rst4
42 files changed, 60 insertions, 33 deletions
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index ec0c77d028db..a23d3c8b4848 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -54,7 +54,7 @@ loop_cmd = $(echo-cmd) $(cmd_$(1))
# e.g. "media" for the linux-tv book-set at ./Documentation/media
quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
- cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media all;\
+ cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2;\
BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
$(SPHINXBUILD) \
-b $2 \
@@ -98,6 +98,7 @@ installmandocs:
cleandocs:
$(Q)rm -rf $(BUILDDIR)
+ $(Q)$(MAKE) -C Documentation/media clean
endif # HAVE_SPHINX
diff --git a/Documentation/media/.gitignore b/Documentation/media/.gitignore
new file mode 100644
index 000000000000..a1363379944a
--- /dev/null
+++ b/Documentation/media/.gitignore
@@ -0,0 +1 @@
+*.pdf
diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile
index a7fb35291f6c..297b85c37ab9 100644
--- a/Documentation/media/Makefile
+++ b/Documentation/media/Makefile
@@ -10,8 +10,35 @@ FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \
TARGETS := $(addprefix $(BUILDDIR)/, $(FILES))
-.PHONY: all
+IMAGES = \
+ typical_media_device.svg \
+ uapi/dvb/dvbstb.svg \
+ uapi/v4l/constraints.svg \
+ uapi/v4l/subdev-image-processing-full.svg \
+ uapi/v4l/subdev-image-processing-scaling-multi-source.svg \
+ uapi/v4l/subdev-image-processing-crop.svg \
+
+IMGTGT := $(patsubst %.png,%.pdf,$(patsubst %.svg,%.pdf,$(IMAGES)))
+IMGPDF := $(patsubst %,$(SRC_DIR)/%,$(IMGTGT))
+
+cmd = $(echo-cmd) $(cmd_$(1))
+
+quiet_cmd_genpdf = GENPDF $2
+ cmd_genpdf = convert $2 $3
+
+%.pdf: %.svg
+ @$(call cmd,genpdf,$<,$@)
+
+.PHONY: all html epub xml latex
+
all: $(BUILDDIR) ${TARGETS}
+html: all
+epub: all
+xml: all
+latex: $(IMGPDF) all
+
+clean:
+ -rm $(IMGTGT) 2>/dev/null
$(BUILDDIR):
$(Q)mkdir -p $@
diff --git a/Documentation/media/intro.rst b/Documentation/media/intro.rst
index f6086c159772..8f7490c9a8ef 100644
--- a/Documentation/media/intro.rst
+++ b/Documentation/media/intro.rst
@@ -13,8 +13,8 @@ A typical media device hardware is shown at :ref:`typical_media_device`.
.. _typical_media_device:
-.. figure:: media_api_files/typical_media_device.*
- :alt: typical_media_device.svg
+.. figure:: typical_media_device.*
+ :alt: typical_media_device.pdf / typical_media_device.svg
:align: center
Typical Media Device
diff --git a/Documentation/media/media_api_files/typical_media_device.pdf b/Documentation/media/media_api_files/typical_media_device.pdf
deleted file mode 100644
index d000d802b20f..000000000000
--- a/Documentation/media/media_api_files/typical_media_device.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/media_api_files/typical_media_device.svg b/Documentation/media/typical_media_device.svg
index f0c82f72c4b6..f0c82f72c4b6 100644
--- a/Documentation/media/media_api_files/typical_media_device.svg
+++ b/Documentation/media/typical_media_device.svg
diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.svg b/Documentation/media/uapi/dvb/dvbstb.svg
index c4140fb518af..c4140fb518af 100644
--- a/Documentation/media/uapi/dvb/intro_files/dvbstb.svg
+++ b/Documentation/media/uapi/dvb/dvbstb.svg
diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst
index 11b96a19a9ab..2ed5c23102b4 100644
--- a/Documentation/media/uapi/dvb/intro.rst
+++ b/Documentation/media/uapi/dvb/intro.rst
@@ -55,7 +55,7 @@ Overview
.. _stb_components:
-.. figure:: intro_files/dvbstb.*
+.. figure:: dvbstb.*
:alt: dvbstb.pdf / dvbstb.svg
:align: center
diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf b/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
deleted file mode 100644
index 0fa75d90c3eb..000000000000
--- a/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png b/Documentation/media/uapi/v4l/bayer.png
index 9b15fb22e817..9b15fb22e817 100644
--- a/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png
+++ b/Documentation/media/uapi/v4l/bayer.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg b/Documentation/media/uapi/v4l/constraints.svg
index f710ee46b1f8..f710ee46b1f8 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg
+++ b/Documentation/media/uapi/v4l/constraints.svg
diff --git a/Documentation/media/uapi/v4l/crop_files/crop.png b/Documentation/media/uapi/v4l/crop.png
index 225998c395df..225998c395df 100644
--- a/Documentation/media/uapi/v4l/crop_files/crop.png
+++ b/Documentation/media/uapi/v4l/crop.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/crop.rst b/Documentation/media/uapi/v4l/crop.rst
index 3ea733a8eef8..578c6f3d20f3 100644
--- a/Documentation/media/uapi/v4l/crop.rst
+++ b/Documentation/media/uapi/v4l/crop.rst
@@ -53,8 +53,8 @@ Cropping Structures
.. _crop-scale:
-.. figure:: crop_files/crop.*
- :alt: crop.pdf / crop.gif
+.. figure:: crop.png
+ :alt: crop.png
:align: center
Image Cropping, Insertion and Scaling
diff --git a/Documentation/media/uapi/v4l/crop_files/crop.pdf b/Documentation/media/uapi/v4l/crop_files/crop.pdf
deleted file mode 100644
index c9fb81cd32f3..000000000000
--- a/Documentation/media/uapi/v4l/crop_files/crop.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst
index b82d837e4ff1..f81d906137ee 100644
--- a/Documentation/media/uapi/v4l/dev-raw-vbi.rst
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi.rst
@@ -221,8 +221,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
.. _vbi-hsync:
-.. figure:: dev-raw-vbi_files/vbi_hsync.*
- :alt: vbi_hsync.pdf / vbi_hsync.gif
+.. figure:: vbi_hsync.png
+ :alt: vbi_hsync.png
:align: center
**Figure 4.1. Line synchronization**
@@ -230,8 +230,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
.. _vbi-525:
-.. figure:: dev-raw-vbi_files/vbi_525.*
- :alt: vbi_525.pdf / vbi_525.gif
+.. figure:: vbi_525.png
+ :alt: vbi_525.png
:align: center
**Figure 4.2. ITU-R 525 line numbering (M/NTSC and M/PAL)**
@@ -240,8 +240,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
.. _vbi-625:
-.. figure:: dev-raw-vbi_files/vbi_625.*
- :alt: vbi_625.pdf / vbi_625.gif
+.. figure:: vbi_625.png
+ :alt: vbi_625.png
:align: center
**Figure 4.3. ITU-R 625 line numbering**
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
deleted file mode 100644
index 0bae28385dfa..000000000000
--- a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
deleted file mode 100644
index bf29b95dcd08..000000000000
--- a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
deleted file mode 100644
index 200b668189bf..000000000000
--- a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst
index fb4d0d45b216..c18e9c5427ee 100644
--- a/Documentation/media/uapi/v4l/dev-subdev.rst
+++ b/Documentation/media/uapi/v4l/dev-subdev.rst
@@ -99,8 +99,8 @@ the video sensor and the host image processing hardware.
.. _pipeline-scaling:
-.. figure:: dev-subdev_files/pipeline.*
- :alt: pipeline.pdf / pipeline.png
+.. figure:: pipeline.png
+ :alt: pipeline.png
:align: center
Image Format Negotiation on Pipelines
@@ -404,8 +404,8 @@ selection will refer to the sink pad format dimensions instead.
.. _subdev-image-processing-crop:
-.. figure:: dev-subdev_files/subdev-image-processing-crop.*
- :alt: subdev-image-processing-crop.svg
+.. figure:: subdev-image-processing-crop.*
+ :alt: subdev-image-processing-crop.pdf / subdev-image-processing-crop.svg
:align: center
**Figure 4.5. Image processing in subdevs: simple crop example**
@@ -421,8 +421,8 @@ pad.
.. _subdev-image-processing-scaling-multi-source:
-.. figure:: dev-subdev_files/subdev-image-processing-scaling-multi-source.*
- :alt: subdev-image-processing-scaling-multi-source.svg
+.. figure:: subdev-image-processing-scaling-multi-source.*
+ :alt: subdev-image-processing-scaling-multi-source.pdf / subdev-image-processing-scaling-multi-source.svg
:align: center
**Figure 4.6. Image processing in subdevs: scaling with multiple sources**
@@ -437,8 +437,8 @@ an area at location specified by the source crop rectangle from it.
.. _subdev-image-processing-full:
-.. figure:: dev-subdev_files/subdev-image-processing-full.*
- :alt: subdev-image-processing-full.svg
+.. figure:: subdev-image-processing-full.*
+ :alt: subdev-image-processing-full.pdf / subdev-image-processing-full.svg
:align: center
**Figure 4.7. Image processing in subdevs: scaling and composition with multiple sinks and sources**
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
deleted file mode 100644
index ee3e37f04b6a..000000000000
--- a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
deleted file mode 100644
index 29a806f839b4..000000000000
--- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
deleted file mode 100644
index b78a8e8f6b35..000000000000
--- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
deleted file mode 100644
index 8f7a95b6eb4d..000000000000
--- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/field-order.rst b/Documentation/media/uapi/v4l/field-order.rst
index 50779a67c3fd..a7e1b4dae343 100644
--- a/Documentation/media/uapi/v4l/field-order.rst
+++ b/Documentation/media/uapi/v4l/field-order.rst
@@ -141,8 +141,8 @@ enum v4l2_field
Field Order, Top Field First Transmitted
========================================
-.. figure:: field-order_files/fieldseq_tb.*
- :alt: fieldseq_tb.pdf / fieldseq_tb.gif
+.. figure:: fieldseq_tb.png
+ :alt: fieldseq_tb.png
:align: center
@@ -151,7 +151,7 @@ Field Order, Top Field First Transmitted
Field Order, Bottom Field First Transmitted
===========================================
-.. figure:: field-order_files/fieldseq_bt.*
- :alt: fieldseq_bt.pdf / fieldseq_bt.gif
+.. figure:: fieldseq_bt.png
+ :alt: fieldseq_bt.png
:align: center
diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
deleted file mode 100644
index 26598b23f80d..000000000000
--- a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
deleted file mode 100644
index 4965b22ddb3a..000000000000
--- a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
+++ /dev/null
Binary files differ
diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png b/Documentation/media/uapi/v4l/fieldseq_bt.png
index 888ce6fed817..888ce6fed817 100644
--- a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png
+++ b/Documentation/media/uapi/v4l/fieldseq_bt.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png b/Documentation/media/uapi/v4l/fieldseq_tb.png
index b69426270b10..b69426270b10 100644
--- a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png
+++ b/Documentation/media/uapi/v4l/fieldseq_tb.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png b/Documentation/media/uapi/v4l/nv12mt.png
index 41401860fb73..41401860fb73 100644
--- a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png
+++ b/Documentation/media/uapi/v4l/nv12mt.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png b/Documentation/media/uapi/v4l/nv12mt_example.png
index 7775f5d7cc46..7775f5d7cc46 100644
--- a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png
+++ b/Documentation/media/uapi/v4l/nv12mt_example.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png b/Documentation/media/uapi/v4l/pipeline.png
index f19b86c2c24d..f19b86c2c24d 100644
--- a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png
+++ b/Documentation/media/uapi/v4l/pipeline.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst
index 9f250a1df2f6..c8a77bc79f2f 100644
--- a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst
@@ -33,7 +33,7 @@ Layout of macroblocks in memory is presented in the following figure.
.. _nv12mt:
-.. figure:: pixfmt-nv12mt_files/nv12mt.*
+.. figure:: nv12mt.png
:alt: nv12mt.png
:align: center
@@ -50,7 +50,7 @@ interleaved. Height of the buffer is aligned to 32.
.. _nv12mt_ex:
-.. figure:: pixfmt-nv12mt_files/nv12mt_example.*
+.. figure:: nv12mt_example.png
:alt: nv12mt_example.png
:align: center
diff --git a/Documentation/media/uapi/v4l/selection-api-003.rst b/Documentation/media/uapi/v4l/selection-api-003.rst
index 15cb3b79f12c..207349c17ead 100644
--- a/Documentation/media/uapi/v4l/selection-api-003.rst
+++ b/Documentation/media/uapi/v4l/selection-api-003.rst
@@ -7,7 +7,7 @@ Selection targets
.. _sel-targets-capture:
-.. figure:: selection-api-003_files/selection.*
+.. figure:: selection.png
:alt: selection.png
:align: center
diff --git a/Documentation/media/uapi/v4l/selection-api-003_files/selection.png b/Documentation/media/uapi/v4l/selection.png
index bfc523eae570..bfc523eae570 100644
--- a/Documentation/media/uapi/v4l/selection-api-003_files/selection.png
+++ b/Documentation/media/uapi/v4l/selection.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
index 65105609374b..2f9c135dfadd 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -1514,14 +1514,12 @@ be named ``MEDIA_BUS_FMT_SRGGB10_2X8_PADHI_LE``.
.. _bayer-patterns:
-.. figure:: subdev-formats_files/bayer.*
+.. figure:: bayer.png
:alt: bayer.png
:align: center
**Figure 4.8 Bayer Patterns**
-
-
The following table lists existing packed Bayer formats. The data
organization is given as an example for the first pixel only.
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg
index 18b0f5de9ed2..18b0f5de9ed2 100644
--- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
+++ b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg
index 3322cf4c0093..3322cf4c0093 100644
--- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
+++ b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg
diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg
index 2340c0f8bc92..2340c0f8bc92 100644
--- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
+++ b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png b/Documentation/media/uapi/v4l/vbi_525.png
index 24937dbec337..24937dbec337 100644
--- a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png
+++ b/Documentation/media/uapi/v4l/vbi_525.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png b/Documentation/media/uapi/v4l/vbi_625.png
index 25c671af41ad..25c671af41ad 100644
--- a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png
+++ b/Documentation/media/uapi/v4l/vbi_625.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png b/Documentation/media/uapi/v4l/vbi_hsync.png
index b04ae50385a7..b04ae50385a7 100644
--- a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png
+++ b/Documentation/media/uapi/v4l/vbi_hsync.png
Binary files differ
diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-g-selection.rst
index 6da359e50668..deb1f6fb473b 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-selection.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-selection.rst
@@ -129,8 +129,8 @@ Selection targets and flags are documented in
.. _sel-const-adjust:
-.. figure:: vidioc-g-selection_files/constraints.*
- :alt: constraints.svg
+.. figure:: constraints.*
+ :alt: constraints.pdf / constraints.svg
:align: center
Size adjustments with constraint flags.