Commit 435c2a31 authored by Anton Khirnov's avatar Anton Khirnov

lavf: remove disabled FF_API_READ_PACKET cruft

parent c7e044c6
...@@ -1287,24 +1287,6 @@ int av_find_best_stream(AVFormatContext *ic, ...@@ -1287,24 +1287,6 @@ int av_find_best_stream(AVFormatContext *ic,
AVCodec **decoder_ret, AVCodec **decoder_ret,
int flags); 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. * Return the next frame of a stream.
* This function returns what is stored in the file, and does not validate * This function returns what is stored in the file, and does not validate
......
...@@ -676,14 +676,6 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -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
/**********************************************************/ /**********************************************************/
/** /**
......
...@@ -49,9 +49,6 @@ ...@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time. * 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 #ifndef FF_API_INTERLEAVE_PACKET
#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) #define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment