diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-08-27 22:10:10 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-08-29 16:27:09 +0200 |
| commit | 449339084fb2fe9259d8612a9c8c2a886022d1f5 (patch) | |
| tree | 3d468c02bf39b9e42bdbc519d5fa503adf172a43 /libavfilter | |
| parent | 7ba98824a948f8ab7c4ad52b5b8a470a741a2d41 (diff) | |
| download | ffmpeg-449339084fb2fe9259d8612a9c8c2a886022d1f5.tar.gz | |
avfilter: add nb_threads to AVFilterContext
To be used in following commits.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 7 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 21f8d9e00d..a8e5a5a73d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -616,6 +616,8 @@ static const AVOption avfilter_options[] = { { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" }, { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "thread_type" }, { "enable", "set enable expression", OFFSET(enable_str), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS }, + { "threads", "Allowed number of threads", OFFSET(nb_threads), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, INT_MAX, FLAGS }, { NULL }, }; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index d804c89d70..15d00f7058 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -361,6 +361,13 @@ struct AVFilterContext { * hardware context information. */ AVBufferRef *hw_device_ctx; + + /** + * Max number of threads allowed in this filter instance. + * If <= 0, its value is ignored. + * Overrides global number of threads set per filter graph. + */ + int nb_threads; }; /** diff --git a/libavfilter/version.h b/libavfilter/version.h index e3e3ed0933..1b91d60820 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 57 +#define LIBAVFILTER_VERSION_MINOR 58 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |