[FFmpeg-cvslog] lavf: remove disabled FF_API_AV_GETTIME cruft
Anton Khirnov
git at videolan.org
Wed Mar 13 12:41:53 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Feb 23 08:20:12 2013 +0100| [7b486ab13bfcfa88a7cd92586de50e49966ec292] | committer: Anton Khirnov
lavf: remove disabled FF_API_AV_GETTIME cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b486ab13bfcfa88a7cd92586de50e49966ec292
---
libavformat/avformat.h | 4 ----
libavformat/utils.c | 7 -------
libavformat/version.h | 3 ---
3 files changed, 14 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index da7fb79..08d2f3a 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 a5a696d..b127e27 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 4add31e..fc34896 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
More information about the ffmpeg-cvslog
mailing list