diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-11 18:23:18 +0100 |
| commit | 7b486ab13bfcfa88a7cd92586de50e49966ec292 (patch) | |
| tree | 88202ce6186411accfc1b9107cb10e31c7d48f1a | |
| parent | 32e5194969e026d790e72e0b3f8f254979ea0f36 (diff) | |
| download | ffmpeg-7b486ab13bfcfa88a7cd92586de50e49966ec292.tar.gz | |
lavf: remove disabled FF_API_AV_GETTIME cruft
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 14 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index da7fb791ff..08d2f3a876 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -207,10 +207,6 @@ #include "avio.h" #include "libavformat/version.h" -#if FF_API_AV_GETTIME -#include "libavutil/time.h" -#endif - struct AVFormatContext; diff --git a/libavformat/utils.c b/libavformat/utils.c index a5a696d6a4..b127e27ce3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3015,13 +3015,6 @@ void av_dump_format(AVFormatContext *ic, av_free(printed); } -#if FF_API_AV_GETTIME && CONFIG_SHARED && HAVE_SYMVER -FF_SYMVER(int64_t, av_gettime, (void), "LIBAVFORMAT_54") -{ - return av_gettime(); -} -#endif - uint64_t ff_ntp_time(void) { return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US; diff --git a/libavformat/version.h b/libavformat/version.h index 4add31e776..fc34896eb9 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -49,9 +49,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_AV_GETTIME -#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE (LIBAVFORMAT_VERSION_MAJOR < 55) #endif |