diff options
author | wm4 <wm4@nowhere> | 2012-11-16 19:12:56 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-16 21:21:16 +0100 |
commit | 7a1396b6ca73d5db194dcc6cebc5ad92e9b22c89 (patch) | |
tree | cfe2387465387659a5564c18acfbd2a9d5aa2012 /DOCS | |
parent | f7163c80658651804437f9a7f5bed6fb34a32830 (diff) | |
download | mpv-7a1396b6ca73d5db194dcc6cebc5ad92e9b22c89.tar.bz2 mpv-7a1396b6ca73d5db194dcc6cebc5ad92e9b22c89.tar.xz |
demux_mf: allow displaying single image files, various cleanups
Enable autoprobing for demux_mf, so that image files can be directly
displayed with e.g. "mpv file.jpg --pause". (The --pause switch is
needed to prevent the window from closing immediately.)
Since demux_mf doesn't have any real file format probing and goes by
file extension only, move the demuxer down the demuxer list to ensure
it's checked last. (ffmpeg's demux_mf equivalent, "image2", probes by
file extensions too, and there doesn't seem to be anything that can
probe typical image file formats from binary data.)
Remove the --mf "w" and "h" suboptions. Don't pass the width/height to
the video stream header. Both of these are useless, because the decoder
reads the real image size at a later point from the file headers.
Remove setting the BITMAPINFOHEADER as well, as vd_lavc doesn't need
this.
Enable --correct-pts by default. This fixes displaying a single image
with vo_vdpau (as mentioned by uau).
Keep around a pointer to the sh_video stream header instead of
accessing demuxer->video->sh_video. Fixes a crash when deselecting the
video track.
Note that the format probing is incorrect when opening images from HTTP
locations. File extensions don't have to match the actual file format.
A correct implementation would require to check the MIME type, or to
probe the binary data correctly.
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/man/en/options.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 860c42f18c..cc52d8f2bb 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1088,12 +1088,10 @@ Maximum A-V sync correction per frame (in seconds) --mf=<option1:option2:...> - Used when decoding from multiple PNG or JPEG files. + Used when decoding from multiple PNG or JPEG files with ``mf://``. Available options are: - :w=<value>: input file width (default: autodetect) - :h=<value>: input file height (default: autodetect) :fps=<value>: output fps (default: 25) :type=<value>: input file type (available: jpeg, png, tga, sgi) |