diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:16:32 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:16:32 +0100 |
| commit | bbd0ebfd835761d1abbe030a8a7866d88b2a8777 (patch) | |
| tree | f65586037b98079c8e77a5876a9930b8258cbd8a /libavcodec/targaenc.c | |
| parent | 25004c7e6eaa91c749763c1dabb41c4fc9c692e2 (diff) | |
| parent | d8f3b0fb584677d4882e3a2d7c28f8b15c7319f5 (diff) | |
| download | ffmpeg-bbd0ebfd835761d1abbe030a8a7866d88b2a8777.tar.gz | |
Merge commit 'd8f3b0fb584677d4882e3a2d7c28f8b15c7319f5'
* commit 'd8f3b0fb584677d4882e3a2d7c28f8b15c7319f5':
targaenc: Move size check to initialization function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/targaenc.c')
| -rw-r--r-- | libavcodec/targaenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 66bc55c397..79030a012b 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -89,10 +89,6 @@ static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int bpp, picsize, datasize = -1, ret, i; uint8_t *out; - if(avctx->width > 0xffff || avctx->height > 0xffff) { - av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n"); - return AVERROR(EINVAL); - } picsize = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); if ((ret = ff_alloc_packet2(avctx, pkt, picsize + 45, 0)) < 0) @@ -190,6 +186,11 @@ FF_ENABLE_DEPRECATION_WARNINGS static av_cold int targa_encode_init(AVCodecContext *avctx) { + if (avctx->width > 0xffff || avctx->height > 0xffff) { + av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n"); + return AVERROR(EINVAL); + } + #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->key_frame = 1; |