diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-11 18:23:02 +0100 |
| commit | 435c2a31ad5eead20eda1152097f60c3bfa22847 (patch) | |
| tree | 8103097e6232b768a640d03b8933133a7e17983f | |
| parent | c7e044c61bb08b3a6e1e8063e8f4449c88b01201 (diff) | |
| download | ffmpeg-435c2a31ad5eead20eda1152097f60c3bfa22847.tar.gz | |
lavf: remove disabled FF_API_READ_PACKET cruft
| -rw-r--r-- | libavformat/avformat.h | 18 | ||||
| -rw-r--r-- | libavformat/utils.c | 8 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 29 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 32d9c0c195..de4f62ca04 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1287,24 +1287,6 @@ int av_find_best_stream(AVFormatContext *ic, AVCodec **decoder_ret, int flags); -#if FF_API_READ_PACKET -/** - * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw - * unprocessed packets - * - * Read a transport packet from a media file. - * - * This function is obsolete and should never be used. - * Use av_read_frame() instead. - * - * @param s media file handle - * @param pkt is filled - * @return 0 if OK, AVERROR_xxx on error - */ -attribute_deprecated -int av_read_packet(AVFormatContext *s, AVPacket *pkt); -#endif - /** * Return the next frame of a stream. * This function returns what is stored in the file, and does not validate diff --git a/libavformat/utils.c b/libavformat/utils.c index e74fa9e218..a5a696d6a4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -676,14 +676,6 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) } } -#if FF_API_READ_PACKET -int av_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - return ff_read_packet(s, pkt); -} -#endif - - /**********************************************************/ /** diff --git a/libavformat/version.h b/libavformat/version.h index 7d45bf00ba..0b19238163 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_READ_PACKET -#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif #ifndef FF_API_INTERLEAVE_PACKET #define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) #endif |