summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLenny Wang <lwanghpc@gmail.com>2013-12-08 21:01:00 -0600
committerMichael Niedermayer <michaelni@gmx.at>2013-12-09 21:21:36 +0100
commit64f73acd1d3853e55a7cd7631987dfd83c4171e7 (patch)
treecdb797b8e3dbe005c675d6ebab4f45cc94b49efd /doc
parent8e702bd3a8f5a4271590ab5aa38a41087ceaab1b (diff)
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
Reviewed-by: Wei Gao <highgod0401@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/APIchanges2
-rw-r--r--doc/fftools-common-opts.texi4
-rw-r--r--doc/utils.texi4
3 files changed, 8 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 08ba47fc8e..5b0de25a79 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,8 @@ libavutil: 2012-10-22
API changes, most recent first:
+2013-12-xx - xxxxxxx - lavu 52.57.100 - opencl.h
+ Add av_opencl_benchmark() function.
2013-11-xx - xxxxxxx - lavu 52.56.100 - ffversion.h
Moves version.h to libavutil/ffversion.h.
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 617af2fa5e..ff6478a1de 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -250,6 +250,10 @@ Possible flags for this option are:
@end table
@end table
+@item -opencl_bench
+Benchmark all available OpenCL devices and show the results. This option
+is only available when FFmpeg has been compiled with @code{--enable-opencl}.
+
@item -opencl_options options (@emph{global})
Set OpenCL environment options. This option is only available when
FFmpeg has been compiled with @code{--enable-opencl}.
diff --git a/doc/utils.texi b/doc/utils.texi
index 937713902a..305566246c 100644
--- a/doc/utils.texi
+++ b/doc/utils.texi
@@ -1051,13 +1051,13 @@ See reference "OpenCL Specification Version: 1.2 chapter 5.6.4".
Select the index of the platform to run OpenCL code.
The specified index must be one of the indexes in the device list
-which can be obtained with @code{av_opencl_get_device_list()}.
+which can be obtained with @code{ffmpeg -opencl_bench} or @code{av_opencl_get_device_list()}.
@item device_idx
Select the index of the device used to run OpenCL code.
The specifed index must be one of the indexes in the device list which
-can be obtained with @code{av_opencl_get_device_list()}.
+can be obtained with @code{ffmpeg -opencl_bench} or @code{av_opencl_get_device_list()}.
@end table