From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 28 Jan 2018 01:46:56 +0000 (+0100)
Subject: avfilter/vf_transpose: Fix regression with packed pixel formats
X-Git-Tag: archive/raspbian/6%11.12-1_deb8u6+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=32ddfff85fc203dffd1f7a4827e9ae47e9b139be;p=libav.git

avfilter/vf_transpose: Fix regression with packed pixel formats

Regression since: c6939f65a116b1ffed345d29d8621ee4ffb32235
Found-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Gbp-Pq: Name CVE-2018-6392-2.patch
---

diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index f2d8fe4..13874a5 100644
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -95,7 +95,7 @@ static int config_props_output(AVFilterLink *outlink)
 
     trans->hsub = desc_in->log2_chroma_w;
     trans->vsub = desc_in->log2_chroma_h;
-    trans->planes = desc_in->nb_components;
+    trans->planes = av_pix_fmt_count_planes(outlink->format);
 
     av_assert0(desc_in->nb_components == desc_out->nb_components);