Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/cbs: Do not use format specifier "z" on Windows.

Browse Source
pull/304/head^2
Carl Eugen Hoyos 6 years ago
parent f22fcd4483
commit 0b7269e62d
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libavcodec/cbs_av1.c
  2. 4
      libavcodec/cbs_vp9.c

10
libavcodec/cbs_av1.c
Unescape View File

@ -773,7 +773,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
if (INT_MAX / 8 < size) { if (INT_MAX / 8 < size) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid fragment: " av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid fragment: "
"too large (%zu bytes).\n", size); "too large (%"SIZE_SPECIFIER" bytes).\n", size);
err = AVERROR_INVALIDDATA; err = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
@ -790,7 +790,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
if (get_bits_left(&gbc) < 8) { if (get_bits_left(&gbc) < 8) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment " av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
"too short (%zu bytes).\n", size); "too short (%"SIZE_SPECIFIER" bytes).\n", size);
err = AVERROR_INVALIDDATA; err = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
@ -809,7 +809,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
if (size < obu_length) { if (size < obu_length) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU length: " av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU length: "
"%"PRIu64", but only %zu bytes remaining in fragment.\n", "%"PRIu64", but only %"SIZE_SPECIFIER" bytes remaining in fragment.\n",
obu_length, size); obu_length, size);
err = AVERROR_INVALIDDATA; err = AVERROR_INVALIDDATA;
goto fail; goto fail;
@ -924,7 +924,7 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx,
} else { } else {
if (unit->data_size < 1 + obu->header.obu_extension_flag) { if (unit->data_size < 1 + obu->header.obu_extension_flag) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU length: " av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU length: "
"unit too short (%zu).\n", unit->data_size); "unit too short (%"SIZE_SPECIFIER").\n", unit->data_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
obu->obu_size = unit->data_size - 1 - obu->header.obu_extension_flag; obu->obu_size = unit->data_size - 1 - obu->header.obu_extension_flag;
@ -1226,7 +1226,7 @@ static int cbs_av1_write_unit(CodedBitstreamContext *ctx,
if (err < 0) { if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a " av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt " "sufficiently large write buffer (last attempt "
"%zu bytes).\n", priv->write_buffer_size); "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err; return err;
} }
} }

4
libavcodec/cbs_vp9.c
Unescape View File

@ -457,7 +457,7 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx,
} }
if (pos + index_size != frag->data_size) { if (pos + index_size != frag->data_size) {
av_log(ctx->log_ctx, AV_LOG_WARNING, "Extra padding at " av_log(ctx->log_ctx, AV_LOG_WARNING, "Extra padding at "
"end of superframe: %zu bytes.\n", "end of superframe: %"SIZE_SPECIFIER" bytes.\n",
frag->data_size - (pos + index_size)); frag->data_size - (pos + index_size));
} }
@ -538,7 +538,7 @@ static int cbs_vp9_write_unit(CodedBitstreamContext *ctx,
if (err < 0) { if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a " av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt " "sufficiently large write buffer (last attempt "
"%zu bytes).\n", priv->write_buffer_size); "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err; return err;
} }
} }

Write Preview
Loading…
Cancel
Save