Commit ba1a19bc authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '16158da9'

* commit '16158da9':
  hnm4: Use av_image_check_size

See: e23b1832Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0e85a28f 16158da9
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include "libavutil/imgutils.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
...@@ -453,6 +454,7 @@ static int hnm_decode_frame(AVCodecContext *avctx, void *data, ...@@ -453,6 +454,7 @@ static int hnm_decode_frame(AVCodecContext *avctx, void *data,
static av_cold int hnm_decode_init(AVCodecContext *avctx) static av_cold int hnm_decode_init(AVCodecContext *avctx)
{ {
Hnm4VideoContext *hnm = avctx->priv_data; Hnm4VideoContext *hnm = avctx->priv_data;
int ret;
if (avctx->extradata_size < 1) { if (avctx->extradata_size < 1) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
...@@ -460,6 +462,10 @@ static av_cold int hnm_decode_init(AVCodecContext *avctx) ...@@ -460,6 +462,10 @@ static av_cold int hnm_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
if (ret < 0)
return ret;
hnm->version = avctx->extradata[0]; hnm->version = avctx->extradata[0];
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
hnm->width = avctx->width; hnm->width = avctx->width;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment