diff options
| author | wm4 <wm4@nowhere> | 2015-07-23 17:17:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-23 17:17:26 +0200 |
| commit | 281c21b7f1d7ccea253beb6d99d35ac485262aa3 (patch) | |
| tree | 9202c4fadd089ba7abb2f05a1f1c5daf2bd66585 | |
| parent | 5b47836082e501c2bf4f0c2dccca5241606b7a56 (diff) | |
| download | mpv-281c21b7f1d7ccea253beb6d99d35ac485262aa3.tar.bz2 mpv-281c21b7f1d7ccea253beb6d99d35ac485262aa3.tar.xz | |
video: don't restrict --vd-lavc-threads to a maximum of 16
Only do it when the number of threads is autodetected, as more than 16
threads are still considered not recommended. (libavcodec prints a
warning.)
| -rw-r--r-- | DOCS/man/options.rst | 7 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index b3a8e95500..7a66b0f798 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -824,10 +824,11 @@ Video Set framedropping mode used with ``--framedrop`` (see skiploopfilter for available skip values). -``--vd-lavc-threads=<0-16>`` +``--vd-lavc-threads=<N>`` Number of threads to use for decoding. Whether threading is actually - supported depends on codec. 0 means autodetect number of cores on the - machine and use that, up to the maximum of 16 (default: 0). + supported depends on codec (default: 0). 0 means autodetect number of cores + on the machine and use that, up to the maximum of 16. You can set more than + 16 threads manually. diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 125141b298..1dc6e28694 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -98,7 +98,7 @@ const struct m_sub_options vd_lavc_conf = { OPT_DISCARD("skipidct", skip_idct, 0), OPT_DISCARD("skipframe", skip_frame, 0), OPT_DISCARD("framedrop", framedrop, 0), - OPT_INTRANGE("threads", threads, 0, 0, 16), + OPT_INT("threads", threads, M_OPT_MIN, .min = 0), OPT_FLAG("bitexact", bitexact, 0), OPT_FLAG("check-hw-profile", check_hw_profile, 0), OPT_KEYVALUELIST("o", avopts, 0), |