add FF_API_UDP_GET_FILE define to disable the deprecated udp_get_file_handle()

public function

Originally committed as revision 25481 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 89a4102fd17955f3d5da39aa39275bdc6f2d01b1..d121b59e378468225071d3dd88e86502610283a8 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -57,6 +57,9 @@
 #ifndef FF_API_GUESS_FORMAT
 #define FF_API_GUESS_FORMAT       (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_UDP_GET_FILE
+#define FF_API_UDP_GET_FILE       (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
 
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 118b7f27c90cf9697aa375463761ace8e1ecc197..e4fd601724db07529a247ab7bb2dc80bca2bde3d 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -562,7 +562,7 @@ 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 (LIBAVFORMAT_VERSION_MAJOR <= 52)
+#if FF_API_UDP_GET_FILE
 int udp_get_file_handle(URLContext *h);
 #endif
 

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 2200c549ca86271ab83085cf6dcd994d598ff26b..b998086407e86622e5e6813a82271bde8c3b3771 100644 (file)
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -276,7 +276,7 @@ int udp_get_local_port(URLContext *h)
  * streams at the same time.
  * @param h media file context
  */
-#if (LIBAVFORMAT_VERSION_MAJOR >= 53)
+#if !FF_API_UDP_GET_FILE
 static
 #endif
 int udp_get_file_handle(URLContext *h)