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 | |
| parent | 256e1f7bdfb0f84c7854b6e4147a8b349e12a905 (diff) | |
| parent | 7b486ab13bfcfa88a7cd92586de50e49966ec292 (diff) | |
| download | ffmpeg-06a83505992d5f49846c18507a6c3eb8a47c650e.tar.gz | |
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')
| -rw-r--r-- | libavformat/avformat.h | 14 | ||||
| -rw-r--r-- | libavformat/mux.c | 9 | ||||
| -rw-r--r-- | libavformat/utils.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 6 |
4 files changed, 0 insertions, 36 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 0fc71aa9bb..dbb80a1ce3 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; @@ -1799,16 +1795,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt); */ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt); -#if FF_API_INTERLEAVE_PACKET -/** - * @deprecated this function was never meant to be called by the user - * programs. - */ -attribute_deprecated -int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, - AVPacket *pkt, int flush); -#endif - /** * Write the stream trailer to an output media file and free the * file private data. diff --git a/libavformat/mux.c b/libavformat/mux.c index 0d74d96ab8..3578a52034 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -699,15 +699,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, } } -#if FF_API_INTERLEAVE_PACKET -int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, - AVPacket *pkt, int flush) -{ - return ff_interleave_packet_per_dts(s, out, pkt, flush); -} - -#endif - /** * Interleave an AVPacket correctly so it can be muxed. * @param out the interleaved packet will be output here 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; diff --git a/libavformat/version.h b/libavformat/version.h index 58c957f6de..67ee0beb70 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -73,12 +73,6 @@ #ifndef FF_API_READ_PACKET #define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56) #endif -#ifndef FF_API_INTERLEAVE_PACKET -#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif -#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 1 #endif |