[FFmpeg-cvslog] lavfi/mergeplanes: Fix little endian yuv formats >8 bit and <16bit.
Carl Eugen Hoyos
git at videolan.org
Tue Nov 1 13:29:44 EET 2016
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Oct 30 00:39:19 2016 +0200| [bf52730051202f5b4d5f06a399a236268e72e296] | committer: Carl Eugen Hoyos
lavfi/mergeplanes: Fix little endian yuv formats >8 bit and <16bit.
Fixes remaining cases of ticket #5916.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf52730051202f5b4d5f06a399a236268e72e296
---
libavfilter/vf_mergeplanes.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c
index c4948cc..c211043 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;
More information about the ffmpeg-cvslog
mailing list