From bf52730051202f5b4d5f06a399a236268e72e296 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 30 Oct 2016 00:39:19 +0200 Subject: lavfi/mergeplanes: Fix little endian yuv formats >8 bit and <16bit. Fixes remaining cases of ticket #5916. --- libavfilter/vf_mergeplanes.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavfilter') diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index c4948cc8c8..c21104320d 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -122,6 +122,7 @@ static int query_formats(AVFilterContext *ctx) for (i = 0; av_pix_fmt_desc_get(i); i++) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i); if (desc->comp[0].depth == s->outdesc->comp[0].depth && + (desc->comp[0].depth <= 8 || (desc->flags & AV_PIX_FMT_FLAG_BE) == (s->outdesc->flags & AV_PIX_FMT_FLAG_BE)) && av_pix_fmt_count_planes(i) == desc->nb_components && (ret = ff_add_format(&formats, i)) < 0) return ret; -- cgit v1.2.3