summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/input.rst16
-rw-r--r--DOCS/man/en/mpv.rst4
-rw-r--r--DOCS/man/en/options.rst61
-rw-r--r--DOCS/man/en/vf.rst39
-rw-r--r--DOCS/man/en/vo.rst10
-rw-r--r--Makefile8
-rw-r--r--TOOLS/osxbundle/mpv.app/Contents/Info.plist2
-rw-r--r--audio/decode/ad.h2
-rw-r--r--audio/decode/ad_internal.h2
-rw-r--r--audio/decode/ad_lavc.c2
-rw-r--r--audio/decode/ad_mpg123.c2
-rw-r--r--audio/decode/ad_spdif.c2
-rw-r--r--audio/out/ao_coreaudio.c5
-rw-r--r--audio/out/ao_lavc.c34
-rw-r--r--compat/libav.h4
-rwxr-xr-xconfigure83
-rw-r--r--core/av_common.c16
-rw-r--r--core/av_log.c7
-rw-r--r--core/bstr.c9
-rw-r--r--core/bstr.h7
-rw-r--r--core/cfg-mplayer.h15
-rw-r--r--core/command.c105
-rw-r--r--core/defaultopts.c7
-rw-r--r--core/encode_lavc.c5
-rw-r--r--core/input/input.c52
-rw-r--r--core/input/input.h2
-rw-r--r--core/input/keycodes.h4
-rw-r--r--core/m_config.c5
-rw-r--r--core/m_option.c426
-rw-r--r--core/m_option.h19
-rw-r--r--core/mp_core.h21
-rw-r--r--core/mp_msg.c5
-rw-r--r--core/mp_msg.h2
-rw-r--r--core/mplayer.c494
-rw-r--r--core/options.h8
-rw-r--r--core/parser-mpcmd.c21
-rw-r--r--core/path.c14
-rw-r--r--core/path.h2
-rw-r--r--core/timeline/tl_edl.c2
-rw-r--r--core/timeline/tl_matroska.c123
-rw-r--r--demux/codec_tags.c2
-rw-r--r--demux/demux.c254
-rw-r--r--demux/demux.h19
-rw-r--r--demux/demux_avi.c3
-rw-r--r--demux/demux_lavf.c264
-rw-r--r--demux/demux_mkv.c1190
-rw-r--r--demux/demux_mpg.c2
-rw-r--r--demux/demux_packet.h2
-rw-r--r--demux/demux_ts.c13
-rw-r--r--demux/ebml.c25
-rw-r--r--demux/ebml.h4
-rw-r--r--demux/matroska.h3
-rw-r--r--demux/stheader.h30
-rw-r--r--demux/video.c4
-rw-r--r--etc/input.conf2
-rw-r--r--osdep/macosx_application.h56
-rw-r--r--osdep/macosx_application.m374
-rw-r--r--osdep/macosx_application_objc.h34
-rw-r--r--osdep/macosx_finder_args.h29
-rw-r--r--osdep/macosx_finder_args.m97
-rw-r--r--stream/cache2.c24
-rw-r--r--stream/cookies.c2
-rw-r--r--stream/dvb_tune.c4
-rw-r--r--stream/http.c2
-rw-r--r--stream/stream.c16
-rw-r--r--stream/stream.h11
-rw-r--r--stream/stream_bluray.c85
-rw-r--r--stream/stream_cdda.c33
-rw-r--r--stream/stream_dvd.c45
-rw-r--r--stream/tvi_v4l2.c27
-rw-r--r--sub/ass_mp.c3
-rw-r--r--sub/dec_sub.c25
-rw-r--r--sub/dec_sub.h7
-rw-r--r--sub/find_subfiles.c1
-rw-r--r--sub/osd_font.otfbin0 -> 2276 bytes
-rw-r--r--sub/osd_font.pfbbin8322 -> 0 bytes
-rw-r--r--sub/osd_libass.c6
-rw-r--r--sub/sd.h1
-rw-r--r--sub/sd_ass.c17
-rw-r--r--sub/sd_lavc.c35
-rw-r--r--sub/sub.c1
-rw-r--r--sub/sub.h1
-rw-r--r--sub/subassconvert.c197
-rw-r--r--sub/subreader.c17
-rw-r--r--sub/subreader.h1
-rw-r--r--video/csputils.c38
-rw-r--r--video/csputils.h2
-rw-r--r--video/decode/vd_lavc.c61
-rw-r--r--video/filter/vf.c4
-rw-r--r--video/filter/vf_hqdn3d.c2
-rw-r--r--video/filter/vf_lavfi.c348
-rw-r--r--video/filter/vf_rotate.c13
-rw-r--r--video/filter/vf_scale.c1
-rw-r--r--video/filter/vf_yadif.c3
-rw-r--r--video/fmt-conversion.c8
-rw-r--r--video/img_format.c9
-rw-r--r--video/img_format.h9
-rw-r--r--video/mp_image.c50
-rw-r--r--video/mp_image.h3
-rw-r--r--video/out/cocoa_common.h5
-rw-r--r--video/out/cocoa_common.m593
-rw-r--r--video/out/gl_cocoa.c8
-rw-r--r--video/out/gl_common.c27
-rw-r--r--video/out/gl_common.h15
-rw-r--r--video/out/gl_osd.c54
-rw-r--r--video/out/gl_osd.h14
-rw-r--r--video/out/gl_video.c76
-rw-r--r--video/out/gl_video.h1
-rw-r--r--video/out/gl_video_shaders.glsl8
-rw-r--r--video/out/gl_wayland.c85
-rw-r--r--video/out/vo_opengl.c72
-rw-r--r--video/out/vo_opengl_old.c5
-rw-r--r--video/out/wayland_common.c341
-rw-r--r--video/out/wayland_common.h47
-rw-r--r--video/out/x11_common.c44
-rw-r--r--video/out/x11_common.h1
116 files changed, 4088 insertions, 2474 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 339168b3c4..638172289c 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -79,6 +79,17 @@ seek <seconds> [relative|absolute|absolute-percent|- [default-precise|exact|keyf
frame_step
Play one frame, then pause.
+frame_back_step
+ Go back by one frame, then pause. Note that this can be very slow (it tries
+ to be precise, not fast), and sometimes fails to behave as expected. How
+ well this works depends on whether precise seeking works correctly (e.g.
+ see the ``--hr-seek-demuxer-offset`` option). Video filters or other video
+ postprocessing that modifies timing of frames (e.g. deinterlacing) should
+ usually work, but might make backstepping silently behave incorrectly in
+ corner cases.
+
+ This doesn't work with audio-only playback.
+
set <property> "<value>"
Set the given property to the given value.
@@ -158,6 +169,10 @@ run "<command>"
quit [<code>]
Exit the player using the given exit code.
+quit_watch_later
+ Exit player, and store current playback position. Playing that file later
+ will seek to the previous position on start.
+
sub_add "<file>"
Load the given subtitle file. It's not selected as current subtitle after
loading.
@@ -269,6 +284,7 @@ length length of the current file in seconds
avsync last A/V synchronization difference
percent-pos x position in current file (0-100)
time-pos x position in current file in seconds
+time-remaining estimated remaining length of the file in seconds
chapter x current chapter number
edition x current MKV edition number
titles number of DVD titles
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 9a62333983..2ebdcab506 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -90,6 +90,10 @@ p / SPACE
q / ESC
Stop playing and quit.
+Q
+ Like ``q``, but store the current playback position. Playing the same file
+ later will resume at the old playback position if possible.
+
U
Stop playing (and quit if ``--idle`` is not used).
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index f528c3f849..cd1b4ab90a 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -273,11 +273,6 @@
Some Blu-ray discs contain scenes that can be viewed from multiple angles.
Here you can tell mpv which angles to use (default: 1).
---bluray-chapter=<ID>
- (Blu-ray only)
- Tells mpv which Blu-ray chapter to start the current title from
- (default: 1).
-
--bluray-device=<path>
(Blu-ray only)
Specify the Blu-ray disc location. Must be a directory with Blu-ray
@@ -298,6 +293,12 @@
from slow media, but can also have negative effects, especially with file
formats that require a lot of seeking, such as mp4. See also ``--no-cache``.
+ Note that half the cache size will be used to allow fast seeking back. This
+ is also the reason why a full cache is usually reported as 50% full. The
+ cache fill display does not include the part of the cache reserved for
+ seeking back. Likewise, when starting a file the cache will be at 100%,
+ because no space is reserved for seeking back yet.
+
--cache-pause=<no|percentage>
If the cache percentage goes below the specified value, pause and wait
until the percentage set by ``--cache-min`` is reached, then resume
@@ -687,6 +688,13 @@
``--fstype=fullscreen``
Fixes fullscreen switching on OpenBox 1.x.
+--native-fs
+ (OS X only)
+ Use OSX's Mission Control's fullscreen feature instead of the custom one
+ provided by mpv. This can potentially break a lot of stuff like
+ ``--geometry`` and is disabled by default. On the other hand it provides
+ a more 'OS X-like' user experience.
+
--gamma=<-100-100>
Adjust the gamma of the video signal (default: 0). Not supported by all
video output drivers.
@@ -849,13 +857,25 @@
:vda: OSX
:crystalhd: Broadcom Crystal HD
+--hwdec-codecs=<codec1,codec2,...|all>
+ Allow hardware decoding for a given list of codecs only. The default is the
+ special value ``all``, which always allows all codecs.
+
+ This is usually only needed with broken GPUs, where fallback to software
+ decoding doesn't work properly.
+
+ *EXAMPLE*:
+
+ - ``mpv --hwdec=vdpau --vo=vdpau --hwdec-codecs=h264,mpeg2video``
+ Enable vdpau decoding for h264 and mpeg2 only.
+
--identify
Deprecated. Use ``TOOLS/mpv_identify.sh``.
--idle
Makes mpv wait idly instead of quitting when there is no file to play.
Mostly useful in slave mode where mpv can be controlled through input
- commands (see also ``--slave``).
+ commands (see also ``--slave-broken``).
--idx
Rebuilds index of files if no index was found, allowing seeking. Useful
@@ -895,7 +915,7