virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e'

Browse Source 
* commit '019a28cd630286ecb2b06ee62025a17c821b493e':
  sanm: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-29 01:22:05 +02:00
commit d55d8229fb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/sanm.c
View File

@ -1407,14 +1407,14 @@ static int decode_frame(AVCodecContext *avctx, void *data,
pos = bytestream2_tell(&ctx->gb); pos = bytestream2_tell(&ctx->gb);
if (bytestream2_get_bytes_left(&ctx->gb) < size) { if (bytestream2_get_bytes_left(&ctx->gb) < size) {
av_log(avctx, AV_LOG_ERROR, "Incorrect chunk size %d.\n", size); av_log(avctx, AV_LOG_ERROR, "Incorrect chunk size %"PRIu32".\n", size);
break; break;
} }
switch (sig) { switch (sig) {
case MKBETAG('N', 'P', 'A', 'L'): case MKBETAG('N', 'P', 'A', 'L'):
if (size != PALETTE_SIZE * 3) { if (size != PALETTE_SIZE * 3) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Incorrect palette block size %d.\n", size); "Incorrect palette block size %"PRIu32".\n", size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for (i = 0; i < PALETTE_SIZE; i++) for (i = 0; i < PALETTE_SIZE; i++)
@ -1440,7 +1440,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
} }
} else { } else {
if (size < PALETTE_DELTA * 2 + 4) { if (size < PALETTE_DELTA * 2 + 4) {
av_log(avctx, AV_LOG_ERROR, "Incorrect palette change block size %d.\n", av_log(avctx, AV_LOG_ERROR,
"Incorrect palette change block size %"PRIu32".\n",
size); size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -1463,7 +1464,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
break; break;
default: default:
bytestream2_skip(&ctx->gb, size); bytestream2_skip(&ctx->gb, size);
av_log(avctx, AV_LOG_DEBUG, "Unknown/unsupported chunk %x.\n", sig); av_log(avctx, AV_LOG_DEBUG,
"Unknown/unsupported chunk %"PRIx32".\n", sig);
break; break;
} }