From f807d6d2009b9f2e70d9a204a0e8b6140a87ec85 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 16 Apr 2013 14:36:49 +0200 Subject: [PATCH] avutil/pixdesc: check step/depth against each other Signed-off-by: Michael Niedermayer --- libavutil/pixdesc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index c03964faef..39e7d6996f 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1848,8 +1848,15 @@ void ff_check_pixfmt_descriptors(void){ for (j=0; jcomp); j++) { const AVComponentDescriptor *c = &d->comp[j]; - if(j>=d->nb_components) + if(j>=d->nb_components) { av_assert0(!c->plane && !c->step_minus1 && !c->offset_plus1 && !c->shift && !c->depth_minus1); + continue; + } + if (d->flags & PIX_FMT_BITSTREAM) { + av_assert0(c->step_minus1 >= c->depth_minus1); + } else { + av_assert0(8*(c->step_minus1+1) >= c->depth_minus1+1); + } } } }