[FFmpeg-devel] [PATCH 12/26] avformat: remove FF_API_AVIOCONTEXT_WRITTEN
James Almer
jamrial at gmail.com
Mon Jan 16 15:38:26 EET 2023
Signed-off-by: James Almer <jamrial at gmail.com>
---
libavformat/avio.h | 10 ----------
libavformat/aviobuf.c | 10 ----------
libavformat/version_major.h | 1 -
3 files changed, 21 deletions(-)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 4bf6b1fbda..5f13e0622d 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -295,16 +295,6 @@ typedef struct AVIOContext {
*/
int ignore_boundary_point;
-#if FF_API_AVIOCONTEXT_WRITTEN
- /**
- * @deprecated field utilized privately by libavformat. For a public
- * statistic of how many bytes were written out, see
- * AVIOContext::bytes_written.
- */
- attribute_deprecated
- int64_t written;
-#endif
-
/**
* Maximum reached position before a backward seek in the write buffer,
* used keeping track of already written data for a later flush.
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 257535a964..4ad734a3c3 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -125,11 +125,6 @@ void ffio_init_context(FFIOContext *ctx,
ctx->current_type = AVIO_DATA_MARKER_UNKNOWN;
ctx->last_time = AV_NOPTS_VALUE;
ctx->short_seek_get = NULL;
-#if FF_API_AVIOCONTEXT_WRITTEN
-FF_DISABLE_DEPRECATION_WARNINGS
- s->written = 0;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
AVIOContext *avio_alloc_context(
@@ -174,11 +169,6 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len)
if (s->pos + len > ctx->written_output_size) {
ctx->written_output_size = s->pos + len;
-#if FF_API_AVIOCONTEXT_WRITTEN
-FF_DISABLE_DEPRECATION_WARNINGS
- s->written = ctx->written_output_size;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
}
}
diff --git a/libavformat/version_major.h b/libavformat/version_major.h
index abc1699685..044af1ebf6 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -42,7 +42,6 @@
*
*/
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)
--
2.39.0
More information about the ffmpeg-devel
mailing list