From ddc376816161bdb24caa0a6698f8a18b41c6f70a Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 14 Sep 2014 21:28:09 -0300
Subject: avformat: remove obsolete FF_API_READ_PACKET cruft

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/avformat.h | 18 ------------------
 libavformat/utils.c    |  7 -------
 libavformat/version.h  |  3 ---
 3 files changed, 28 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 56c139905a..f189741af6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2052,24 +2052,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 0008073c5b..d71fae47c6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -691,13 +691,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 a9b6cb6562..486979f199 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -61,9 +61,6 @@
 #define FF_API_URL_FEOF                 (LIBAVFORMAT_VERSION_MAJOR < 57)
 #endif
 
-#ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_R_FRAME_RATE
 #define FF_API_R_FRAME_RATE            1
 #endif
-- 
cgit v1.2.3