diff options
| -rw-r--r-- | libavcodec/qdm2.c | 2 | ||||
| -rw-r--r-- | libavcodec/roqvideodec.c | 7 | ||||
| -rw-r--r-- | libavcodec/vqavideo.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 387a3c6a3b..c0c80a1fe7 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1257,7 +1257,7 @@ static void qdm2_decode_super_block (QDM2Context *q) for (i = 0; packet_bytes > 0; i++) { int j; - if (i>=FF_ARRAY_ELEMS(q->sub_packet_list_A)) { + if (i >= FF_ARRAY_ELEMS(q->sub_packet_list_A)) { SAMPLES_NEEDED_2("too many packet bytes"); return; } 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; diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index e89d4d1fcf..43b3aaf57c 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -538,7 +538,8 @@ static int vqa_decode_chunk(VqaContext *s) chunk_size = bytestream2_get_be32(&s->gb); if (chunk_size > MAX_CODEBOOK_SIZE - s->next_codebook_buffer_index) { - av_log(s->avctx, AV_LOG_ERROR, "cbp0 chunk too large (0x%X bytes)\n", chunk_size); + av_log(s->avctx, AV_LOG_ERROR, "cbp0 chunk too large (%u bytes)\n", + chunk_size); return AVERROR_INVALIDDATA; } @@ -566,7 +567,8 @@ static int vqa_decode_chunk(VqaContext *s) chunk_size = bytestream2_get_be32(&s->gb); if (chunk_size > MAX_CODEBOOK_SIZE - s->next_codebook_buffer_index) { - av_log(s->avctx, AV_LOG_ERROR, "cbpz chunk too large (0x%X bytes)\n", chunk_size); + av_log(s->avctx, AV_LOG_ERROR, "cbpz chunk too large (%u bytes)\n", + chunk_size); return AVERROR_INVALIDDATA; } |