diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/vqavideo.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/vqavideo.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/libffmpeg/libavcodec/vqavideo.c b/src/libffmpeg/libavcodec/vqavideo.c index b3b310b64..97cbbd6d9 100644 --- a/src/libffmpeg/libavcodec/vqavideo.c +++ b/src/libffmpeg/libavcodec/vqavideo.c @@ -82,10 +82,6 @@ #define MAX_VECTORS (MAX_CODEBOOK_VECTORS + SOLID_PIXEL_VECTORS) #define MAX_CODEBOOK_SIZE (MAX_VECTORS * 4 * 4) -#undef LE_16 -#undef BE_16 -#undef BE_32 - #define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ @@ -159,7 +155,7 @@ static int vqa_decode_init(AVCodecContext *avctx) /* make sure the extradata made it */ if (s->avctx->extradata_size != VQA_HEADER_SIZE) { - printf(" VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE); return -1; } @@ -210,8 +206,8 @@ static int vqa_decode_init(AVCodecContext *avctx) #define CHECK_COUNT() \ if (dest_index + count > dest_size) { \ - printf (" VQA video: decode_format80 problem: next op would overflow dest_index\n"); \ - printf (" VQA video: current dest_index = %d, count = %d, dest_size = %d\n", \ + av_log(NULL, AV_LOG_ERROR, " VQA video: decode_format80 problem: next op would overflow dest_index\n"); \ + av_log(NULL, AV_LOG_ERROR, " VQA video: current dest_index = %d, count = %d, dest_size = %d\n", \ dest_index, count, dest_size); \ return; \ } @@ -235,7 +231,7 @@ static void decode_format80(unsigned char *src, int src_size, return; if (dest_index >= dest_size) { - printf (" VQA video: decode_format80 problem: dest_index (%d) exceeded dest_size (%d)\n", + av_log(NULL, AV_LOG_ERROR, " VQA video: decode_format80 problem: dest_index (%d) exceeded dest_size (%d)\n", dest_index, dest_size); return; } @@ -303,7 +299,7 @@ static void decode_format80(unsigned char *src, int src_size, * not every entry needs to be filled */ if (check_size) if (dest_index < dest_size) - printf (" VQA video: decode_format80 problem: decode finished with dest_index (%d) < dest_size (%d)\n", + av_log(NULL, AV_LOG_ERROR, " VQA video: decode_format80 problem: decode finished with dest_index (%d) < dest_size (%d)\n", dest_index, dest_size); } @@ -371,7 +367,7 @@ static void vqa_decode_chunk(VqaContext *s) break; default: - printf (" VQA video: Found unknown chunk type: %c%c%c%c (%08X)\n", + av_log(s->avctx, AV_LOG_ERROR, " VQA video: Found unknown chunk type: %c%c%c%c (%08X)\n", (chunk_type >> 24) & 0xFF, (chunk_type >> 16) & 0xFF, (chunk_type >> 8) & 0xFF, @@ -388,7 +384,7 @@ static void vqa_decode_chunk(VqaContext *s) if ((cpl0_chunk != -1) && (cplz_chunk != -1)) { /* a chunk should not have both chunk types */ - printf (" VQA video: problem: found both CPL0 and CPLZ chunks\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CPL0 and CPLZ chunks\n"); return; } @@ -405,7 +401,7 @@ static void vqa_decode_chunk(VqaContext *s) chunk_size = BE_32(&s->buf[cpl0_chunk + 4]); /* sanity check the palette size */ if (chunk_size / 3 > 256) { - printf (" VQA video: problem: found a palette chunk with %d colors\n", + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found a palette chunk with %d colors\n", chunk_size / 3); return; } @@ -423,7 +419,7 @@ static void vqa_decode_chunk(VqaContext *s) if ((cbf0_chunk != -1) && (cbfz_chunk != -1)) { /* a chunk should not have both chunk types */ - printf (" VQA video: problem: found both CBF0 and CBFZ chunks\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CBF0 and CBFZ chunks\n"); return; } @@ -442,7 +438,7 @@ static void vqa_decode_chunk(VqaContext *s) chunk_size = BE_32(&s->buf[cbf0_chunk + 4]); /* sanity check the full codebook size */ if (chunk_size > MAX_CODEBOOK_SIZE) { - printf (" VQA video: problem: CBF0 chunk too large (0x%X bytes)\n", + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: CBF0 chunk too large (0x%X bytes)\n", chunk_size); return; } @@ -455,7 +451,7 @@ static void vqa_decode_chunk(VqaContext *s) if (vptz_chunk == -1) { /* something is wrong if there is no VPTZ chunk */ - printf (" VQA video: problem: no VPTZ chunk found\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: no VPTZ chunk found\n"); return; } @@ -512,7 +508,7 @@ static void vqa_decode_chunk(VqaContext *s) /* handle partial codebook */ if ((cbp0_chunk != -1) && (cbpz_chunk != -1)) { /* a chunk should not have both chunk types */ - printf (" VQA video: problem: found both CBP0 and CBPZ chunks\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CBP0 and CBPZ chunks\n"); return; } @@ -577,7 +573,7 @@ static int vqa_decode_frame(AVCodecContext *avctx, avctx->release_buffer(avctx, &s->frame); if (avctx->get_buffer(avctx, &s->frame)) { - printf (" VQA Video: get_buffer() failed\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA Video: get_buffer() failed\n"); return -1; } |