From 1137ddf3302ef12525c9c95767e6daa0c1031ce7 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 25 Feb 2021 14:22:30 +0100 Subject: avformat: Remove next API for AV(In|Out)putFormat Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- libavformat/avformat.h | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'libavformat/avformat.h') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8600ee1bf7..6c97aff423 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -533,9 +533,6 @@ typedef struct AVOutputFormat { #define ff_const59 #else #define ff_const59 const -#endif -#if FF_API_NEXT - ff_const59 struct AVOutputFormat *next; #endif /** * size of private data so that it can be allocated in the wrapper @@ -683,10 +680,6 @@ typedef struct AVInputFormat { * New public fields should be added right above. ***************************************************************** */ -#if FF_API_NEXT - ff_const59 struct AVInputFormat *next; -#endif - /** * Raw demuxers store their codec ID here. */ @@ -1941,24 +1934,6 @@ const char *avformat_configuration(void); */ const char *avformat_license(void); -#if FF_API_NEXT -/** - * Initialize libavformat and register all the muxers, demuxers and - * protocols. If you do not call this function, then you can select - * exactly which formats you want to support. - * - * @see av_register_input_format() - * @see av_register_output_format() - */ -attribute_deprecated -void av_register_all(void); - -attribute_deprecated -void av_register_input_format(AVInputFormat *format); -attribute_deprecated -void av_register_output_format(AVOutputFormat *format); -#endif - /** * Do global initialization of network libraries. This is optional, * and not recommended anymore. @@ -1981,24 +1956,6 @@ int avformat_network_init(void); */ int avformat_network_deinit(void); -#if FF_API_NEXT -/** - * If f is NULL, returns the first registered input format, - * if f is non-NULL, returns the next registered input format after f - * or NULL if f is the last one. - */ -attribute_deprecated -AVInputFormat *av_iformat_next(const AVInputFormat *f); - -/** - * If f is NULL, returns the first registered output format, - * if f is non-NULL, returns the next registered output format after f - * or NULL if f is the last one. - */ -attribute_deprecated -AVOutputFormat *av_oformat_next(const AVOutputFormat *f); -#endif - /** * Iterate over all registered muxers. * -- cgit v1.2.3