[FFmpeg-cvslog] lavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft

Anton Khirnov git at videolan.org
Wed Apr 20 04:52:17 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Feb  3 12:42:38 2011 +0100| [4df001d77f8f39d2914b21f14ca2236b0ffd6a48] | committer: Anton Khirnov

lavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4df001d77f8f39d2914b21f14ca2236b0ffd6a48
---

 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 dae56c6..3e47285 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1043,13 +1043,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.
  * avformat_free_context() can be used to free the context and everything
diff --git a/libavformat/options.c b/libavformat/options.c
index 40edcec..2192ff6 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 9b8192d..f87665c 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,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



More information about the ffmpeg-cvslog mailing list