diff options
| author | Paul B Mahol <onemda@gmail.com> | 2022-04-29 20:45:06 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2022-04-29 20:50:33 +0200 |
| commit | 3415028d139c36406c2e7695f0c923fb01213ef1 (patch) | |
| tree | 880ae5318cf96afeb345fdec1cc8f48e92e24d0c /libavfilter | |
| parent | 126d5d3b5fa7916a0df8edc6ca44316d60a70ad8 (diff) | |
| download | ffmpeg-3415028d139c36406c2e7695f0c923fb01213ef1.tar.gz | |
avfilter/vf_mix: fix multiple threads usage
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_mix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index c04504bba0..79c96e5aec 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -243,7 +243,7 @@ static int process_frame(FFFrameSync *fs) td.in = in; td.out = out; ff_filter_execute(ctx, mix_frames, &td, NULL, - FFMIN(s->height[0], s->nb_threads)); + FFMIN(s->height[1], s->nb_threads)); return ff_filter_frame(outlink, out); } @@ -438,7 +438,7 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in) td.out = out; td.in = s->frames; ff_filter_execute(ctx, mix_frames, &td, NULL, - FFMIN(s->height[0], ff_filter_get_nb_threads(ctx))); + FFMIN(s->height[1], s->nb_threads)); return ff_filter_frame(outlink, out); } |