[FFmpeg-cvslog] lavf: remove disabled FF_API_PARSE_DATE cruft
Anton Khirnov
git at videolan.org
Sat Jan 28 08:05:07 CET 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan 12 13:31:55 2012 +0100| [ecd5f41a0695238d52e4134136265d3b63bd8656] | committer: Anton Khirnov
lavf: remove disabled FF_API_PARSE_DATE cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecd5f41a0695238d52e4134136265d3b63bd8656
---
libavformat/avformat.h | 12 ------------
libavformat/utils.c | 11 -----------
libavformat/version.h | 3 ---
3 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 9156be0..19a8a97 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1737,18 +1737,6 @@ void av_dump_format(AVFormatContext *ic,
const char *url,
int is_output);
-#if FF_API_PARSE_DATE
-/**
- * Parse datestr and return a corresponding number of microseconds.
- *
- * @param datestr String representing a date or a duration.
- * See av_parse_time() for the syntax of the provided string.
- * @deprecated in favor of av_parse_time()
- */
-attribute_deprecated
-int64_t parse_date(const char *datestr, int duration);
-#endif
-
/**
* Get the current time in microseconds.
*/
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2f4a6d1..5131fad 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3373,17 +3373,6 @@ uint64_t ff_ntp_time(void)
return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
}
-#if FF_API_PARSE_DATE
-#include "libavutil/parseutils.h"
-
-int64_t parse_date(const char *timestr, int duration)
-{
- int64_t timeval;
- av_parse_time(&timeval, timestr, duration);
- return timeval;
-}
-#endif
-
#if FF_API_FIND_INFO_TAG
#include "libavutil/parseutils.h"
diff --git a/libavformat/version.h b/libavformat/version.h
index e1daff2..ffb04bb 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_PARSE_DATE
-#define FF_API_PARSE_DATE (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
#ifndef FF_API_FIND_INFO_TAG
#define FF_API_FIND_INFO_TAG (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
More information about the ffmpeg-cvslog
mailing list