ffmpeg | branch: master | Paul B Mahol <[email protected]> | Fri Apr 29 20:45:06 2022 +0200| [3415028d139c36406c2e7695f0c923fb01213ef1] | committer: Paul B Mahol
avfilter/vf_mix: fix multiple threads usage > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3415028d139c36406c2e7695f0c923fb01213ef1 --- libavfilter/vf_mix.c | 4 ++-- 1 file 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); } _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
