diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 14:39:28 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 14:47:37 +0200 |
commit | ae0148ff60cbf0e1d81f86f7300280bb48056c71 (patch) | |
tree | 4475a163fd8618af23fb2df92d05d1a11f302beb | |
parent | 3dea13e710ce525375c5458fe16d6df80bd02517 (diff) | |
download | ffmpeg-ae0148ff60cbf0e1d81f86f7300280bb48056c71.tar.gz |
swscale: Assert that pixel format descriptor is not NULL
This may help static analyzers, the pixel format is checked
during initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libswscale/swscale.c | 2 | ||||
-rw-r--r-- | libswscale/utils.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 5312016927..1945e1dc9b 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -784,6 +784,8 @@ static int check_image_pointers(const uint8_t * const data[4], enum AVPixelForma const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); int i; + av_assert2(desc); + for (i = 0; i < 4; i++) { int plane = desc->comp[i].plane; if (!data[plane] || !linesizes[plane]) diff --git a/libswscale/utils.c b/libswscale/utils.c index f9f4ec6cb7..0c78d7515b 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1036,6 +1036,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, return AVERROR(EINVAL); } } + av_assert2(desc_src && desc_dst); i = flags & (SWS_POINT | SWS_AREA | |