diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:59:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:59:36 +0100 |
| commit | 6cb8e40f4372a41dd72a001a72c17c0969f2a941 (patch) | |
| tree | 1ef4fb21d60f3776b022838468bc2f8265410c2f | |
| parent | b5b36e45b3282818b8374c8385a9c353a6ac3ff4 (diff) | |
| parent | e7ee74485b436c34591177c18c8643764a55d516 (diff) | |
| download | ffmpeg-6cb8e40f4372a41dd72a001a72c17c0969f2a941.tar.gz | |
Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4
* commit 'e7ee74485b436c34591177c18c8643764a55d516':
hnm4: Use av_image_check_size
See: e23b18321fb5cffb6e05d0b0ef00de9733f560da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hnm4video.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index d8c51d0b75..31995bc75c 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -22,6 +22,7 @@ #include <string.h> +#include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" @@ -453,6 +454,7 @@ static int hnm_decode_frame(AVCodecContext *avctx, void *data, static av_cold int hnm_decode_init(AVCodecContext *avctx) { Hnm4VideoContext *hnm = avctx->priv_data; + int ret; if (avctx->extradata_size < 1) { av_log(avctx, AV_LOG_ERROR, @@ -460,6 +462,10 @@ static av_cold int hnm_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } + ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); + if (ret < 0) + return ret; + hnm->version = avctx->extradata[0]; avctx->pix_fmt = AV_PIX_FMT_PAL8; hnm->width = avctx->width; |