diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-10-30 00:39:19 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-11-01 12:28:36 +0100 |
| commit | bf52730051202f5b4d5f06a399a236268e72e296 (patch) | |
| tree | 6d2a98992d5aac7c9f2f65e91d76d3127e4d393b /libavfilter/vf_mergeplanes.c | |
| parent | 1a65d2a3ccc2a07e2da19d47c987e1e5a0bd77c6 (diff) | |
lavfi/mergeplanes: Fix little endian yuv formats >8 bit and <16bit.
Fixes remaining cases of ticket #5916.
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
| -rw-r--r-- | libavfilter/vf_mergeplanes.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |