summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-02-23 08:20:12 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-11 18:23:10 +0100
commit32e5194969e026d790e72e0b3f8f254979ea0f36 (patch)
tree8bbab9cee1cf9b8f481c4c6bab57b544a6183a6e /libavformat
parent435c2a31ad5eead20eda1152097f60c3bfa22847 (diff)
downloadffmpeg-streaming-32e5194969e026d790e72e0b3f8f254979ea0f36.zip
ffmpeg-streaming-32e5194969e026d790e72e0b3f8f254979ea0f36.tar.gz
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h10
-rw-r--r--libavformat/mux.c9
-rw-r--r--libavformat/version.h3
3 files changed, 0 insertions, 22 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index de4f62c..da7fb79 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 cb3c297..76b0fb4 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 0b19238..4add31e 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
OpenPOWER on IntegriCloud