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-05-17 12:49:28 +0200
commit4a620243b9618a75d3edbb436e102e944b55cede (patch)
tree9ec63e7b3a92b69dfb2df773515151a55f699f7b
parent1f3ca53b8ae32e30e661fdaa1f1a04bed3f95640 (diff)
downloadffmpeg-4a620243b9618a75d3edbb436e102e944b55cede.tar.gz
lavfi/fade: Do not overread input buffer.
(cherry picked from commit ab3ff19f08b7a83e320c39ab066f289c242b8030)
-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 cc10b122ca..6283f3ed06 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;