diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:42 +0100 |
| commit | cc10ab79ec68697b961aebb7e1cb9eb5f529db60 (patch) | |
| tree | 95e057f7a81d55813f058c9b2f4f8ca781cf286a | |
| parent | ecd5f41a0695238d52e4134136265d3b63bd8656 (diff) | |
| download | ffmpeg-cc10ab79ec68697b961aebb7e1cb9eb5f529db60.tar.gz | |
lavf: remove disabled FF_API_FIND_INFO_TAG cruft
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/utils.c | 9 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 19a8a97d26..cbb139feca 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 5131fadfaa..185418f53d 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 ffb04bb6bf..7696cd64a5 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 |