diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 13:07:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 13:28:32 +0200 |
| commit | b4c88a4c4ceae7faa66ea6b4fc66b696a597976e (patch) | |
| tree | 681ee34e9f2752604f4685f536b0870e9c715365 /libavcodec | |
| parent | 374a2f4562117a4fb1c381e756f2ef0a068b1542 (diff) | |
| parent | 5372cda67109848d22146289e401669266217e80 (diff) | |
| download | ffmpeg-b4c88a4c4ceae7faa66ea6b4fc66b696a597976e.tar.gz | |
Merge commit '5372cda67109848d22146289e401669266217e80'
* commit '5372cda67109848d22146289e401669266217e80':
rv10: Validate the dimensions set from the container
This check could be replaced by a width==0||height==0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rv10.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 8d4f759707..0f88ad212a 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -449,6 +449,9 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n"); return AVERROR_INVALIDDATA; } + if ((ret = av_image_check_size(avctx->coded_width, + avctx->coded_height, 0, avctx)) < 0) + return ret; ff_MPV_decode_defaults(s); |