diff options
| author | James Almer <jamrial@gmail.com> | 2021-09-03 10:29:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-09-04 10:35:01 -0300 |
| commit | f599ae88c25d2c84c4f3be1abe30777b68e249d5 (patch) | |
| tree | 37c67dd6dc5ee379a5bd44fbd10873eec6b3cbd8 | |
| parent | f58939affe39f39038cbdfc6b731b1c9caed3caf (diff) | |
| download | ffmpeg-f599ae88c25d2c84c4f3be1abe30777b68e249d5.tar.gz | |
avfilter/avfiltergraph: add an "auto" constant to the threads option
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavfilter/avfiltergraph.c | 5 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 383d9c5478..45b028cd9c 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -50,8 +50,9 @@ static const AVOption filtergraph_options[] = { { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, F|V|A, "thread_type" }, { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .flags = F|V|A, .unit = "thread_type" }, - { "threads", "Maximum number of threads", OFFSET(nb_threads), - AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, F|V|A }, + { "threads", "Maximum number of threads", OFFSET(nb_threads), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, INT_MAX, F|V|A, "threads"}, + {"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, .flags = F|V|A, .unit = "threads"}, {"scale_sws_opts" , "default scale filter options" , OFFSET(scale_sws_opts) , AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, F|V }, {"aresample_swr_opts" , "default aresample filter options" , OFFSET(aresample_swr_opts) , diff --git a/libavfilter/version.h b/libavfilter/version.h index ff12ff9f8f..2110048b77 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 8 #define LIBAVFILTER_VERSION_MINOR 7 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |