From patchwork Sat Oct 29 22:43:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1227 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1704003vsd; Sat, 29 Oct 2016 15:43:36 -0700 (PDT) X-Received: by 10.194.235.103 with SMTP id ul7mr19777424wjc.201.1477781016205; Sat, 29 Oct 2016 15:43:36 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jy8si9475700wjc.220.2016.10.29.15.43.35; Sat, 29 Oct 2016 15:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C57C76897B5; Sun, 30 Oct 2016 01:43:30 +0300 (EEST) X-Original-To: ffmpeg-devel@mplayerhq.hu Delivered-To: ffmpeg-devel@mplayerhq.hu Received: from rainbow.studorg.tuwien.ac.at (rainbow.studorg.tuwien.ac.at [128.131.30.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4112D68974F for ; Sun, 30 Oct 2016 01:43:24 +0300 (EEST) Received: from cehoyos (helo=localhost) by rainbow.studorg.tuwien.ac.at with local-esmtp (Exim 4.84_2) (envelope-from ) id 1c0cLX-0001gF-EI for ffmpeg-devel@mplayerhq.hu; Sun, 30 Oct 2016 00:43:27 +0200 Date: Sun, 30 Oct 2016 00:43:27 +0200 (CEST) From: Carl Eugen Hoyos X-X-Sender: cehoyos@rainbow.studorg.tuwien.ac.at To: FFmpeg Development Message-ID: User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH]lavfi/mergeplanes: Fix little endian formats >8 bit. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #5916 for (for example) yuv444p9le. Please comment, Carl Eugen From e50c9ee93ce6a8ceb21d3319667eb1b392c1d2da Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 30 Oct 2016 00:39:19 +0200 Subject: [PATCH] lavfi/mergeplanes: Fix little endian formats >8 bit. Fixes ticket #5916. --- 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; -- 1.8.4.5