summaryrefslogtreecommitdiff
path: root/libavfilter/vf_colormatrix.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2015-03-17 20:09:49 +0100
committerClément Bœsch <u@pkh.me>2015-03-17 20:19:54 +0100
commit09f057170e52442a9136b8298bb37897cc81f9e9 (patch)
treeeab6abc3b3c18835362bad48e5caf77f5bcb7854 /libavfilter/vf_colormatrix.c
parent2cfa1fdb08a9fa5f88bc829b24ac865488cdb60f (diff)
avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p
Fix crash with for example: ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -
Diffstat (limited to 'libavfilter/vf_colormatrix.c')
-rw-r--r--libavfilter/vf_colormatrix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c
index cec0e3a96b..78d1bad217 100644
--- a/libavfilter/vf_colormatrix.c
+++ b/libavfilter/vf_colormatrix.c
@@ -416,7 +416,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
FFMIN(in->height, ctx->graph->nb_threads));
else if (in->format == AV_PIX_FMT_YUV420P)
ctx->internal->execute(ctx, process_slice_yuv420p, &td, NULL,
- FFMIN(in->height, ctx->graph->nb_threads));
+ FFMAX(1, FFMIN(in->height, ctx->graph->nb_threads) & ~1));
else
ctx->internal->execute(ctx, process_slice_uyvy422, &td, NULL,
FFMIN(in->height, ctx->graph->nb_threads));