diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:37:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:37:03 +0100 |
| commit | 06a83505992d5f49846c18507a6c3eb8a47c650e (patch) | |
| tree | dda157473729622e9797446d4b717f5dab0a9b1c /libavformat/utils.c | |
| parent | 256e1f7bdfb0f84c7854b6e4147a8b349e12a905 (diff) | |
| parent | 7b486ab13bfcfa88a7cd92586de50e49966ec292 (diff) | |
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
lavf: remove disabled FF_API_AV_GETTIME cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9491075aef..b232902ab8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3631,13 +3631,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; |