summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--video/out/aspect.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 8694f053f6..287d0e0227 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -41,7 +41,6 @@ Interface changes
- add `playlist-path` and `playlist/N/playlist-path` properties
- add `--x11-wid-title` option
- add `--libplacebo-opts` option
- - change `--video-pan-x/y` to be relative to the destination rectangle
- add `--audio-file-exts`, `--cover-art-auto-exts`, and `--sub-auto-exts`
- change `slang` default back to NULL
- remove special handling of the `auto` value from `--alang/slang/vlang` options
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7a36e78f79..ebd0882acf 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1546,7 +1546,9 @@ Video
``--video-pan-x=<value>``, ``--video-pan-y=<value>``
Moves the displayed video rectangle by the given value in the X or Y
- direction. The unit is in fractions of the size of the destination rectangle.
+ direction. The unit is in fractions of the size of the scaled video (the
+ full size, even if parts of the video are not visible due to panscan or
+ other options).
For example, displaying a video fullscreen on a 1920x1080 screen with
``--video-pan-x=-0.1`` would move the video 192 pixels to the left and
diff --git a/video/out/aspect.c b/video/out/aspect.c
index 84fdb13b69..2e34419118 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -86,7 +86,7 @@ static void src_dst_split_scaling(int src_size, int dst_size,
scaled_src_size = MPMAX(scaled_src_size, 1);
align = (align + 1) / 2;
- *dst_start = (dst_size - scaled_src_size) * align + pan * dst_size;
+ *dst_start = (dst_size - scaled_src_size) * align + pan * scaled_src_size;
*dst_end = *dst_start + scaled_src_size;
// Distance of screen frame to video