Commit 36440982 authored by Paul B Mahol's avatar Paul B Mahol Committed by Michael Niedermayer

vqavideo: remove some superfluous " VQA video: "

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 015fd02b
...@@ -128,14 +128,14 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) ...@@ -128,14 +128,14 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
/* make sure the extradata made it */ /* make sure the extradata made it */
if (s->avctx->extradata_size != VQA_HEADER_SIZE) { if (s->avctx->extradata_size != VQA_HEADER_SIZE) {
av_log(s->avctx, AV_LOG_ERROR, " VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE); av_log(s->avctx, AV_LOG_ERROR, "expected extradata size of %d\n", VQA_HEADER_SIZE);
return -1; return -1;
} }
/* load up the VQA parameters from the header */ /* load up the VQA parameters from the header */
s->vqa_version = s->avctx->extradata[0]; s->vqa_version = s->avctx->extradata[0];
if (s->vqa_version < 1 || s->vqa_version > 3) { if (s->vqa_version < 1 || s->vqa_version > 3) {
av_log(s->avctx, AV_LOG_ERROR, " VQA video: unsupported version %d\n", s->vqa_version); av_log(s->avctx, AV_LOG_ERROR, "unsupported version %d\n", s->vqa_version);
return -1; return -1;
} }
s->width = AV_RL16(&s->avctx->extradata[6]); s->width = AV_RL16(&s->avctx->extradata[6]);
...@@ -367,7 +367,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -367,7 +367,7 @@ static int vqa_decode_chunk(VqaContext *s)
break; break;
default: default:
av_log(s->avctx, AV_LOG_ERROR, " VQA video: Found unknown chunk type: %c%c%c%c (%08X)\n", av_log(s->avctx, AV_LOG_ERROR, "Found unknown chunk type: %c%c%c%c (%08X)\n",
(chunk_type >> 24) & 0xFF, (chunk_type >> 24) & 0xFF,
(chunk_type >> 16) & 0xFF, (chunk_type >> 16) & 0xFF,
(chunk_type >> 8) & 0xFF, (chunk_type >> 8) & 0xFF,
...@@ -384,7 +384,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -384,7 +384,7 @@ static int vqa_decode_chunk(VqaContext *s)
if ((cpl0_chunk != -1) && (cplz_chunk != -1)) { if ((cpl0_chunk != -1) && (cplz_chunk != -1)) {
/* a chunk should not have both chunk types */ /* a chunk should not have both chunk types */
av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CPL0 and CPLZ chunks\n"); av_log(s->avctx, AV_LOG_ERROR, "problem: found both CPL0 and CPLZ chunks\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -402,7 +402,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -402,7 +402,7 @@ static int vqa_decode_chunk(VqaContext *s)
chunk_size = bytestream2_get_be32(&s->gb); chunk_size = bytestream2_get_be32(&s->gb);
/* sanity check the palette size */ /* sanity check the palette size */
if (chunk_size / 3 > 256) { if (chunk_size / 3 > 256) {
av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found a palette chunk with %d colors\n", av_log(s->avctx, AV_LOG_ERROR, "problem: found a palette chunk with %d colors\n",
chunk_size / 3); chunk_size / 3);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -420,7 +420,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -420,7 +420,7 @@ static int vqa_decode_chunk(VqaContext *s)
if ((cbf0_chunk != -1) && (cbfz_chunk != -1)) { if ((cbf0_chunk != -1) && (cbfz_chunk != -1)) {
/* a chunk should not have both chunk types */ /* a chunk should not have both chunk types */
av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CBF0 and CBFZ chunks\n"); av_log(s->avctx, AV_LOG_ERROR, "problem: found both CBF0 and CBFZ chunks\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -441,7 +441,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -441,7 +441,7 @@ static int vqa_decode_chunk(VqaContext *s)
chunk_size = bytestream2_get_be32(&s->gb); chunk_size = bytestream2_get_be32(&s->gb);
/* sanity check the full codebook size */ /* sanity check the full codebook size */
if (chunk_size > MAX_CODEBOOK_SIZE) { if (chunk_size > MAX_CODEBOOK_SIZE) {
av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: CBF0 chunk too large (0x%X bytes)\n", av_log(s->avctx, AV_LOG_ERROR, "problem: CBF0 chunk too large (0x%X bytes)\n",
chunk_size); chunk_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -453,7 +453,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -453,7 +453,7 @@ static int vqa_decode_chunk(VqaContext *s)
if (vptz_chunk == -1) { if (vptz_chunk == -1) {
/* something is wrong if there is no VPTZ chunk */ /* something is wrong if there is no VPTZ chunk */
av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: no VPTZ chunk found\n"); av_log(s->avctx, AV_LOG_ERROR, "problem: no VPTZ chunk found\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -524,7 +524,7 @@ static int vqa_decode_chunk(VqaContext *s) ...@@ -524,7 +524,7 @@ static int vqa_decode_chunk(VqaContext *s)
/* handle partial codebook */ /* handle partial codebook */
if ((cbp0_chunk != -1) && (cbpz_chunk != -1)) { if ((cbp0_chunk != -1) && (cbpz_chunk != -1)) {
/* a chunk should not have both chunk types */ /* a chunk should not have both chunk types */
av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CBP0 and CBPZ chunks\n"); av_log(s->avctx, AV_LOG_ERROR, "problem: found both CBP0 and CBPZ chunks\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment