[FFmpeg-cvslog] lavc/cbs: Do not use format specifier "z" on Windows.
ffmpeg | branch: release/4.1 | Carl Eugen Hoyos | Mon Dec
17 14:39:41 2018 +0100| [b3b5941ec7b4c1dbb059b0cd85db3c659d5c8039] | committer:
James Almer
lavc/cbs: Do not use format specifier "z" on Windows.
(cherry picked from commit 0b7269e62d0345fec5f1ee9ee7b960e8d25c5dd1)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3b5941ec7b4c1dbb059b0cd85db3c659d5c8039
---
libavcodec/cbs_av1.c | 10 +-
libavcodec/cbs_vp9.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index e4e3964118..80628c72ba 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -795,7 +795,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext
*ctx,
if (INT_MAX / 8 < size) {
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;
goto fail;
}
@@ -819,7 +819,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext
*ctx,
if (get_bits_left() < 8) {
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;
goto fail;
}
@@ -835,7 +835,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext
*ctx,
if (size < 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);
err = AVERROR_INVALIDDATA;
goto fail;
@@ -950,7 +950,7 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx,
} else {
if (unit->data_size < 1 + obu->header.obu_extension_flag) {
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;
}
obu->obu_size = unit->data_size - 1 - obu->header.obu_extension_flag;
@@ -1256,7 +1256,7 @@ static int cbs_av1_write_unit(CodedBitstreamContext *ctx,
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt "
- "%zu bytes).\n", priv->write_buffer_size);
+ "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err;
}
}
diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c
index f145694e22..0b5f137ed8 100644
--- a/libavcodec/cbs_vp9.c
+++ b/libavcodec/cbs_vp9.c
@@ -457,7 +457,7 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext
*ctx,
}
if (pos + index_size != frag->data_size) {
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));
}
@@ -538,7 +538,7 @@ static int cbs_vp9_write_unit(CodedBitstreamContext *ctx,
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt "
- "%zu bytes).\n", priv->write_buffer_size);
+ "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err;
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/cbs: Do not use format specifier "z" on Windows.
ffmpeg | branch: master | Carl Eugen Hoyos | Mon Dec 17
14:39:41 2018 +0100| [0b7269e62d0345fec5f1ee9ee7b960e8d25c5dd1] | committer:
Carl Eugen Hoyos
lavc/cbs: Do not use format specifier "z" on Windows.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b7269e62d0345fec5f1ee9ee7b960e8d25c5dd1
---
libavcodec/cbs_av1.c | 10 +-
libavcodec/cbs_vp9.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index e02bc7027a..b3f81ae93a 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -773,7 +773,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext
*ctx,
if (INT_MAX / 8 < size) {
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;
goto fail;
}
@@ -790,7 +790,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext
*ctx,
if (get_bits_left() < 8) {
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;
goto fail;
}
@@ -809,7 +809,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext
*ctx,
if (size < 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);
err = AVERROR_INVALIDDATA;
goto fail;
@@ -924,7 +924,7 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx,
} else {
if (unit->data_size < 1 + obu->header.obu_extension_flag) {
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;
}
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) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt "
- "%zu bytes).\n", priv->write_buffer_size);
+ "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err;
}
}
diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c
index f145694e22..0b5f137ed8 100644
--- a/libavcodec/cbs_vp9.c
+++ b/libavcodec/cbs_vp9.c
@@ -457,7 +457,7 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext
*ctx,
}
if (pos + index_size != frag->data_size) {
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));
}
@@ -538,7 +538,7 @@ static int cbs_vp9_write_unit(CodedBitstreamContext *ctx,
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt "
- "%zu bytes).\n", priv->write_buffer_size);
+ "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err;
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
