git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avcodec/bmp: Use ff_set_dimensions()
[ffmpeg.git]
/
libavcodec
/
bmp.c
diff --git
a/libavcodec/bmp.c
b/libavcodec/bmp.c
index
7295749
..
65d239e
100644
(file)
--- a/
libavcodec/bmp.c
+++ b/
libavcodec/bmp.c
@@
-133,8
+133,11
@@
static int bmp_decode_frame(AVCodecContext *avctx,
alpha = bytestream_get_le32(&buf);
}
alpha = bytestream_get_le32(&buf);
}
- avctx->width = width;
- avctx->height = height > 0 ? height : -(unsigned)height;
+ ret = ff_set_dimensions(avctx, width, height > 0 ? height : -(unsigned)height);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions %d %d\n", width, height);
+ return AVERROR_INVALIDDATA;
+ }
avctx->pix_fmt = AV_PIX_FMT_NONE;
avctx->pix_fmt = AV_PIX_FMT_NONE;