[libav-commits] lavf: remove disabled FF_API_DUMP_FORMAT cruft

Anton Khirnov git at libav.org
Fri Jan 27 10:59:18 CET 2012


Module: libav
Branch: master
Commit: 997420abf2e5856f5b9e9267ca5cce6fe5c8a406

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Thu Jan 12 13:31:55 2012 +0100

lavf: remove disabled FF_API_DUMP_FORMAT cruft

---

 libavformat/avformat.h |    6 ------
 libavformat/utils.c    |   10 ----------
 libavformat/version.h  |    3 ---
 3 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 629f738..9156be0 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1731,12 +1731,6 @@ void av_url_split(char *proto,         int proto_size,
                   char *path,          int path_size,
                   const char *url);
 
-#if FF_API_DUMP_FORMAT
-attribute_deprecated void dump_format(AVFormatContext *ic,
-                                      int index,
-                                      const char *url,
-                                      int is_output);
-#endif
 
 void av_dump_format(AVFormatContext *ic,
                     int index,
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8860d47..2f4a6d1 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3282,16 +3282,6 @@ static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_out
     dump_metadata(NULL, st->metadata, "    ");
 }
 
-#if FF_API_DUMP_FORMAT
-void dump_format(AVFormatContext *ic,
-                 int index,
-                 const char *url,
-                 int is_output)
-{
-    av_dump_format(ic, index, url, is_output);
-}
-#endif
-
 void av_dump_format(AVFormatContext *ic,
                     int index,
                     const char *url,
diff --git a/libavformat/version.h b/libavformat/version.h
index f55fc01..e1daff2 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_DUMP_FORMAT
-#define FF_API_DUMP_FORMAT             (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_PARSE_DATE
 #define FF_API_PARSE_DATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif



More information about the libav-commits mailing list