lavf: remove disabled FF_API_AV_GETTIME cruft

pull/12/merge
Anton Khirnov 12 years ago
parent 32e5194969
commit 7b486ab13b
  1. 4
      libavformat/avformat.h
  2. 7
      libavformat/utils.c
  3. 3
      libavformat/version.h

@ -207,10 +207,6 @@
#include "avio.h"
#include "libavformat/version.h"
#if FF_API_AV_GETTIME
#include "libavutil/time.h"
#endif
struct AVFormatContext;

@ -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;

@ -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

Loading…
Cancel
Save