diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-02-25 15:07:18 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-05-17 12:46:35 +0200 |
| commit | 836a66eeb05c678feba79c5f7f093d936f9723d2 (patch) | |
| tree | 2cead45c36a108a46e1775a03c9828e051acb1ac /libavfilter | |
| parent | 346c4f0ad0bd3c5c2ae26120da044824fef25066 (diff) | |
| download | ffmpeg-836a66eeb05c678feba79c5f7f093d936f9723d2.tar.gz | |
lavfi/fade: Do not overread input buffer.
(cherry picked from commit ab3ff19f08b7a83e320c39ab066f289c242b8030)
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_fade.c | 4 |
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; |