From 2b679020f7b7ba957f92bcaabacf38d50b856810 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 11 Apr 2015 19:16:34 +0200 Subject: vo_opengl: unify blend-subtitles-res and blend-subtitles --- DOCS/man/vo.rst | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'DOCS/man/vo.rst') diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 3e5840acfa..2447a8c455 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -692,7 +692,7 @@ Available video output drivers are: Default is 128x256x64. Sizes must be a power of two, and 512 at most. - ``blend-subtitles`` + ``blend-subtitles=`` Blend subtitles directly onto upscaled video frames, before interpolation and/or color management (default: no). Enabling this causes subtitles to be affected by ``icc-profile``, ``target-prim``, @@ -703,6 +703,10 @@ Available video output drivers are: visible portion of the video, so you can't have subtitles exist in the black margins below a video (for example). + If ``video`` is selected, the behavior is similar to ``yes``, but subs + are drawn at the video's native resolution, and scaled along with the + video. + .. warning:: This changes the way subtitle colors are handled. Normally, subtitle colors are assumed to be in sRGB and color managed as such. Enabling this makes them treated as being in the @@ -710,17 +714,6 @@ Available video output drivers are: things like softsubbed ASS signs to match the video colors, but may cause SRT subtitles or similar to look slightly off. - ``blend-subtitles-res=`` - The resolution at which subtitles get drawn if ``blend-subtitles`` is - enabled (default: display). In the absence of ``blend-subtitles``, - subtitles are always drawn at the window's size, together with the OSD. - - display - Subs are drawn directly at the window's size. - video - Subs are drawn at the video's native resolution, and scaled along - with the video. - ``alpha=`` Decides what to do if the input has an alpha component (default: blend). -- cgit v1.2.3