[FFmpeg-devel] [PATCH 07/16] lavf: remove FF_API_UDP_GET_FILE cruft

[Anton Khirnov]

---
 libavformat/avio.h    |    3 ---
 libavformat/udp.c     |    2 --
 libavformat/version.h |    3 ---
 3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index ccfc96c..7817ee0 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -571,8 +571,5 @@ void init_checksum(ByteIOContext *s,
 /* udp.c */
 int udp_set_remote_url(URLContext *h, const char *uri);
 int udp_get_local_port(URLContext *h);
-#if FF_API_UDP_GET_FILE
-int udp_get_file_handle(URLContext *h);
-#endif
 
 #endif /* AVFORMAT_AVIO_H */
diff --git a/libavformat/udp.c b/libavformat/udp.c
index aa17c97..86549e5 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -292,9 +292,7 @@ int udp_get_local_port(URLContext *h)
  * streams at the same time.
  * @param h media file context
  */
-#if !FF_API_UDP_GET_FILE
 static
-#endif
 int udp_get_file_handle(URLContext *h)
 {
     UDPContext *s = h->priv_data;
diff --git a/libavformat/version.h b/libavformat/version.h
index 7bceac8..ede32df 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -44,9 +44,6 @@
 #ifndef FF_API_URL_CLASS
 #define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
 #endif
-#ifndef FF_API_UDP_GET_FILE
-#define FF_API_UDP_GET_FILE            (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_URL_SPLIT
 #define FF_API_URL_SPLIT               (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
-- 
1.7.2.3