diff options
| -rw-r--r-- | libavformat/avformat.h | 10 | ||||
| -rw-r--r-- | libavformat/mux.c | 9 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index de4f62ca04..da7fb791ff 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1449,16 +1449,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 cb3c297a6b..76b0fb4dc6 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -495,15 +495,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/version.h b/libavformat/version.h index 0b19238163..4add31e776 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -49,9 +49,6 @@ * the public API and may change, break or disappear at any time. */ -#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 |