From 618d7f59b0baa95f2151f45a6026de4d7dace4aa Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 6 Sep 2016 18:43:51 +0200 Subject: vo_vdpau: rename some sub-options Since the sub-options have been deprecated very recently, and are redirected to global options, we don't need to document this change. --- DOCS/man/vo.rst | 4 ++-- video/out/vo_vdpau.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 7eb8b28bd4..a3645617ae 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -163,11 +163,11 @@ Available video output drivers are: with the composited mode behavior of the NVIDIA driver, there is no hard playback speed limit even without the disabled logic. Enabled by default, use ``no-composite-detect`` to disable. - ``--vo-vdpau-queuetime_windowed=`` and ``queuetime_fs=`` + ``--vo-vdpau-queuetime-windowed=`` and ``queuetime-fs=`` Use VDPAU's presentation queue functionality to queue future video frame changes at most this many milliseconds in advance (default: 50). See below for additional information. - ``--vo-vdpau-output_surfaces=<2-15>`` + ``--vo-vdpau-output-surfaces=<2-15>`` Allocate this many output surfaces to display video frames (default: 3). See below for additional information. ``--vo-vdpau-colorkey=<#RRGGBB|#AARRGGBB>`` diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 2ce3764b2a..25ab72db80 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -1152,15 +1152,18 @@ const struct vo_driver video_out_vdpau = { OPT_INTRANGE("hqscaling", hqscaling, 0, 0, 9), OPT_FLOAT("fps", user_fps, 0), OPT_FLAG("composite-detect", composite_detect, 0, OPTDEF_INT(1)), - OPT_INT("queuetime_windowed", flip_offset_window, 0, OPTDEF_INT(50)), - OPT_INT("queuetime_fs", flip_offset_fs, 0, OPTDEF_INT(50)), - OPT_INTRANGE("output_surfaces", num_output_surfaces, 0, + OPT_INT("queuetime-windowed", flip_offset_window, 0, OPTDEF_INT(50)), + OPT_INT("queuetime-fs", flip_offset_fs, 0, OPTDEF_INT(50)), + OPT_INTRANGE("output-surfaces", num_output_surfaces, 0, 2, MAX_OUTPUT_SURFACES, OPTDEF_INT(3)), OPT_COLOR("colorkey", colorkey, 0, .defval = &(const struct m_color) { .r = 2, .g = 5, .b = 7, .a = 255, }), OPT_FLAG("force-yuv", force_yuv, 0), + OPT_REPLACED("queuetime_windowed", "queuetime-windowed"), + OPT_REPLACED("queuetime_fs", "queuetime-fs"), + OPT_REPLACED("output_surfaces", "output-surfaces"), {NULL}, }, .legacy_prefix = "vo-vdpau", -- cgit v1.2.3