diff mbox series

[FFmpeg-devel,v2,18/33] avformat: remove FF_API_AVIOCONTEXT_WRITTEN

Message ID 20230204104204.20721-19-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,v2,01/33] avformat/avformat: Remove AVOutputFormat.data_codec | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Anton Khirnov Feb. 4, 2023, 10:41 a.m. UTC 
From: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/avio.h          | 10 ----------
 libavformat/aviobuf.c       | 10 ----------
 libavformat/version_major.h |  1 -
 3 files changed, 21 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 4bf6b1fbdaa..5f13e0622d3 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 257535a9642..4ad734a3c3e 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 abc1699685a..044af1ebf6f 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)