summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-03-18 14:24:53 +0100
committerwm4 <wm4@nowhere>2017-03-18 14:24:53 +0100
commit8e75297c269a2679a5d1683d7d7cb745aba40182 (patch)
treecb4497cacb0823395abb2aa0eb72c5ca373c84bf
parentd17a719f4e665d873a552e46632e4d73154ce011 (diff)
downloadmpv-8e75297c269a2679a5d1683d7d7cb745aba40182.tar.bz2
mpv-8e75297c269a2679a5d1683d7d7cb745aba40182.tar.xz
image_writer: remove useless formats
Nobody cares about those.
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--DOCS/man/vo.rst8
-rw-r--r--video/image_writer.c4
4 files changed, 2 insertions, 16 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 44ac8039e2..76c8e5f596 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -22,6 +22,8 @@ Interface changes
--- mpv 0.25.0 ---
- remove opengl-cb dxva2 dummy hwdec interop
(see git "vo_opengl: remove dxva2 dummy hwdec backend")
+ - remove ppm, pgm, pgmyuv, tga choices from the --screenshot-format and
+ --vo-image-format options
--- mpv 0.24.0 ---
- deprecate --hwdec-api and replace it with --opengl-hwdec-interop.
The new option accepts both --hwdec values, as well as named backends.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 83ef901eed..469ed29c44 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3107,10 +3107,6 @@ Screenshot
Available choices:
:png: PNG
- :ppm: PPM
- :pgm: PGM
- :pgmyuv: PGM with YV12 pixel format
- :tga: TARGA
:jpg: JPEG (default)
:jpeg: JPEG (same as jpg, but with .jpeg file ending)
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index c60dd3feb8..a282541519 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -418,14 +418,6 @@ Available video output drivers are:
JPEG files, extension .jpeg.
png
PNG files.
- ppm
- Portable bitmap format.
- pgm
- Portable graymap format.
- pgmyuv
- Portable graymap format, using the YV12 pixel format.
- tga
- Truevision TGA.
``--vo-image-png-compression=<0-9>``
PNG compression factor (speed vs. file size tradeoff) (default: 7)
diff --git a/video/image_writer.c b/video/image_writer.c
index a1c199adda..3c280f278d 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -261,10 +261,6 @@ unknown:
static const struct img_writer img_writers[] = {
{ "png", write_lavc, .lavc_codec = AV_CODEC_ID_PNG },
- { "ppm", write_lavc, .lavc_codec = AV_CODEC_ID_PPM },
- { "pgm", write_lavc, .lavc_codec = AV_CODEC_ID_PGM },
- { "pgmyuv", write_lavc, .lavc_codec = AV_CODEC_ID_PGMYUV },
- { "tga", write_lavc, .lavc_codec = AV_CODEC_ID_TARGA },
#if HAVE_JPEG
{ "jpg", write_jpeg },
{ "jpeg", write_jpeg },