diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 14:26:53 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 14:26:53 +0400 |
commit | 96008082dbd3a2475ad429b02bf73ba20b4ea9bf (patch) | |
tree | 6f441d4c7afbdb359c98dac5d5420ab5f9be4764 /libavcodec/roqvideodec.c | |
parent | c63f9fb37a7b7da03bed6d79115f7f2e36607808 (diff) | |
parent | 488f87be873506abb01d67708a67c10a4dd29283 (diff) |
Merge commit '488f87be873506abb01d67708a67c10a4dd29283'
* commit '488f87be873506abb01d67708a67c10a4dd29283':
roqvideodec: check dimensions validity
vqavideo: check chunk sizes before reading chunks
qdm2: check array index before use, fix out of array accesses
Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/roqvideodec.c')
-rw-r--r-- | libavcodec/roqvideodec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index c90939df04..6812f9af70 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -171,9 +171,10 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) s->avctx = avctx; - if (avctx->width%16 || avctx->height%16) { - av_log_ask_for_sample(avctx, "dimensions not being a multiple of 16 are unsupported\n"); - return AVERROR_PATCHWELCOME; + if (avctx->width % 16 || avctx->height % 16) { + av_log(avctx, AV_LOG_ERROR, + "Dimensions must be a multiple of 16\n"); + return AVERROR_PATCHWELCOME; } s->width = avctx->width; |