aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avio.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2024-01-25 11:37:30 -0300
committerJames Almer <jamrial@gmail.com>2024-03-07 08:53:30 -0300
commit02aea61d69d8f81bc285e2131bf25f96a3e27feb (patch)
tree309d841fbdbf73f3bc05699395ff03a55c3a7c15 /libavformat/avio.h
parentd6799ee0e41dee35ebf9c664173aed8e3ab24141 (diff)
downloadffmpeg-02aea61d69d8f81bc285e2131bf25f96a3e27feb.tar.gz
avformat: remove deprecated FF_API_AVIO_WRITE_NONCONST
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/avio.h')
-rw-r--r--libavformat/avio.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 2241e3484b..ebf611187d 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -232,11 +232,7 @@ typedef struct AVIOContext {
void *opaque; /**< A private pointer, passed to the read/write/seek/...
functions. */
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
-#if FF_API_AVIO_WRITE_NONCONST
- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
-#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size);
-#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence);
int64_t pos; /**< position in the file of the current buffer */
int eof_reached; /**< true if was unable to read due to error or eof */
@@ -284,13 +280,8 @@ typedef struct AVIOContext {
/**
* A callback that is used instead of write_packet.
*/
-#if FF_API_AVIO_WRITE_NONCONST
- int (*write_data_type)(void *opaque, uint8_t *buf, int buf_size,
- enum AVIODataMarkerType type, int64_t time);
-#else
int (*write_data_type)(void *opaque, const uint8_t *buf, int buf_size,
enum AVIODataMarkerType type, int64_t time);
-#endif
/**
* If set, don't call write_data_type separately for AVIO_DATA_MARKER_BOUNDARY_POINT,
* but ignore them and treat them as AVIO_DATA_MARKER_UNKNOWN (to avoid needlessly
@@ -410,11 +401,7 @@ AVIOContext *avio_alloc_context(
int write_flag,
void *opaque,
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
-#if FF_API_AVIO_WRITE_NONCONST
- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
-#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size),
-#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence));
/**