diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 14:36:49 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 14:36:49 +0200 |
commit | f807d6d2009b9f2e70d9a204a0e8b6140a87ec85 (patch) | |
tree | 5ac932f4c6617fdebfb3ab4d624ff72a0b3aacab /libavutil/pixdesc.c | |
parent | 20e99a9c10cdbe9ad659dce5bdec569d744f8219 (diff) | |
download | ffmpeg-f807d6d2009b9f2e70d9a204a0e8b6140a87ec85.tar.gz |
avutil/pixdesc: check step/depth against each other
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
-rw-r--r-- | libavutil/pixdesc.c | 9 |
1 files changed, 8 insertions, 1 deletions
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; j<FF_ARRAY_ELEMS(d->comp); 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); + } } } } |