RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e' 

* 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
parent 60831f441d 019a28cd63
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);
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;
}
switch (sig) {
case MKBETAG('N', 'P', 'A', 'L'):
if (size != PALETTE_SIZE * 3) {
av_log(avctx, AV_LOG_ERROR,
"Incorrect palette block size %d.\n", size);
"Incorrect palette block size %"PRIu32".\n", size);
return AVERROR_INVALIDDATA;
}
for (i = 0; i < PALETTE_SIZE; i++)
@ -1440,7 +1440,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
}
} else {
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);
return AVERROR_INVALIDDATA;
}
@ -1463,7 +1464,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
break;
default:
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;
}