aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-02-25 15:07:18 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-02-25 15:07:18 +0100
commitab3ff19f08b7a83e320c39ab066f289c242b8030 (patch)
treea538bef37466944465921763ed0d7cc0f4f1f11c
parentbbbc8c618884a838c00faaaa91898017dd431117 (diff)
downloadffmpeg-ab3ff19f08b7a83e320c39ab066f289c242b8030.tar.gz
lavfi/fade: Do not overread input buffer.
-rw-r--r--libavfilter/vf_fade.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index 80ce75dcda..a7597cdff0 100644
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -138,7 +138,9 @@ static int config_props(AVFilterLink *inlink)
s->hsub = pixdesc->log2_chroma_w;
s->vsub = pixdesc->log2_chroma_h;
- s->bpp = av_get_bits_per_pixel(pixdesc) >> 3;
+ s->bpp = pixdesc->flags & AV_PIX_FMT_FLAG_PLANAR ?
+ 1 :
+ av_get_bits_per_pixel(pixdesc) >> 3;
s->alpha &= !!(pixdesc->flags & AV_PIX_FMT_FLAG_ALPHA);
s->is_packed_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0;