diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-24 13:29:45 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-24 13:34:39 +0100 |
| commit | 46f4f8ad865d4e4d867d14edb44a656318951ec1 (patch) | |
| tree | 0e85a99befbcfc982b98ebc3ac994fbbdd470ec0 /libavcodec/dnxhddec.c | |
| parent | 1436769c57cc6e5209609073e5fd60776a293669 (diff) | |
| parent | 1263b2039eb5aaf1522e9de9f07c787ab30a5f50 (diff) | |
| download | ffmpeg-streaming-46f4f8ad865d4e4d867d14edb44a656318951ec1.zip ffmpeg-streaming-46f4f8ad865d4e4d867d14edb44a656318951ec1.tar.gz | |
Merge commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50'
* commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50':
Adjust printf conversion specifiers to match variable signedness
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/dnxhddec.c')
| -rw-r--r-- | libavcodec/dnxhddec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index defbf10..305fd52 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -278,7 +278,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, } if (buf_size < ctx->cid_table->coding_unit_size) { - av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %d).\n", + av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %u).\n", buf_size, ctx->cid_table->coding_unit_size); return AVERROR_INVALIDDATA; } @@ -608,7 +608,7 @@ decode_coding_unit: if ((avctx->width || avctx->height) && (ctx->width != avctx->width || ctx->height != avctx->height)) { - av_log(avctx, AV_LOG_WARNING, "frame size changed: %dx%d -> %dx%d\n", + av_log(avctx, AV_LOG_WARNING, "frame size changed: %dx%d -> %ux%u\n", avctx->width, avctx->height, ctx->width, ctx->height); first_field = 1; } |
