[libav-commits] lavf: remove disabled FF_API_FIND_INFO_TAG cruft

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


Module: libav
Branch: master
Commit: cc10ab79ec68697b961aebb7e1cb9eb5f529db60

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_FIND_INFO_TAG cruft

---

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

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 19a8a97..cbb139f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1742,13 +1742,6 @@ void av_dump_format(AVFormatContext *ic,
  */
 int64_t av_gettime(void);
 
-#if FF_API_FIND_INFO_TAG
-/**
- * @deprecated use av_find_info_tag in libavutil instead.
- */
-attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
-#endif
-
 /**
  * Return in 'buf' the path with '%d' replaced by a number.
  *
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5131fad..185418f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3373,15 +3373,6 @@ uint64_t ff_ntp_time(void)
   return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
 }
 
-#if FF_API_FIND_INFO_TAG
-#include "libavutil/parseutils.h"
-
-int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info)
-{
-    return av_find_info_tag(arg, arg_size, tag1, info);
-}
-#endif
-
 int av_get_frame_filename(char *buf, int buf_size,
                           const char *path, int number)
 {
diff --git a/libavformat/version.h b/libavformat/version.h
index ffb04bb..7696cd6 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_FIND_INFO_TAG
-#define FF_API_FIND_INFO_TAG           (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_PKT_DUMP
 #define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif



More information about the libav-commits mailing list