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:51:10 +0200 |
| commit | ac81fbba74155a595281d7401e79b95ed1d767aa (patch) | |
| tree | 5ec495216693fb515530e4479dc7df1495eebce7 | |
| parent | 8a35f24ca94375a4855deefee9ea8c3b7a5908dc (diff) | |
| download | ffmpeg-ac81fbba74155a595281d7401e79b95ed1d767aa.tar.gz | |
lavfi/fade: Do not overread input buffer.
(cherry picked from commit ab3ff19f08b7a83e320c39ab066f289c242b8030)
| -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 6c9b2252a0..54b2d89c4d 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -126,7 +126,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; |