[SCM] libav/experimental: add FF_API_UDP_GET_FILE define to disable the deprecated udp_get_file_handle() public function

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8ef30ac1f309fcf87c4df92e71c890f48cc199bb
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Oct 15 12:49:48 2010 +0000

    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 89a4102..d121b59 100644
--- 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 118b7f2..e4fd601 100644
--- 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 2200c54..b998086 100644
--- 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)

-- 
Libav/FFmpeg packaging