[FFmpeg-devel] [PATCH 09/16] lavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft

[Anton Khirnov]

---
 libavformat/avformat.h |    7 -------
 libavformat/options.c  |    7 -------
 libavformat/version.h  |    3 ---
 3 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 014f9f8..5f970ac 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -985,13 +985,6 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
                        int buf_size,
                        AVFormatParameters *ap);
 
-#if FF_API_ALLOC_FORMAT_CONTEXT
-/**
- * @deprecated Use avformat_alloc_context() instead.
- */
-attribute_deprecated AVFormatContext *av_alloc_format_context(void);
-#endif
-
 /**
  * Allocate an AVFormatContext.
  * Can be freed with av_free() but do not forget to free everything you
diff --git a/libavformat/options.c b/libavformat/options.c
index 20fbca5..214c62f 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -84,10 +84,3 @@ AVFormatContext *avformat_alloc_context(void)
     ic->av_class = &av_format_context_class;
     return ic;
 }
-
-#if FF_API_ALLOC_FORMAT_CONTEXT
-AVFormatContext *av_alloc_format_context(void)
-{
-    return avformat_alloc_context();
-}
-#endif
diff --git a/libavformat/version.h b/libavformat/version.h
index 761c6f8..a3d75b2 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -44,9 +44,6 @@
 #ifndef FF_API_URL_CLASS
 #define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
 #endif
-#ifndef FF_API_ALLOC_FORMAT_CONTEXT
-#define FF_API_ALLOC_FORMAT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_PARSE_FRAME_PARAM
 #define FF_API_PARSE_FRAME_PARAM       (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
-- 
1.7.2.3