Browse Source

lavf: remove disabled FF_API_AV_GETTIME cruft

tags/n2.0
Anton Khirnov 12 years ago
parent
commit
7b486ab13b
3 changed files with 0 additions and 14 deletions
  1. +0
    -4
      libavformat/avformat.h
  2. +0
    -7
      libavformat/utils.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 4
libavformat/avformat.h View File

@@ -207,10 +207,6 @@
#include "avio.h"
#include "libavformat/version.h"

#if FF_API_AV_GETTIME
#include "libavutil/time.h"
#endif

struct AVFormatContext;




+ 0
- 7
libavformat/utils.c View File

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


+ 0
- 3
libavformat/version.h View File

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