lavf: remove disabled FF_API_READ_PACKET cruft

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 32d9c0c..de4f62c 100644 (file)
--- 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 e74fa9e..a5a696d 100644 (file)
--- 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 7d45bf0..0b19238 100644 (file)
--- 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