[FFmpeg-cvslog] r25481 - in trunk/libavformat: avformat.h avio.h udp.c

[aurel]

Author: aurel
Date: Fri Oct 15 14:49:48 2010
New Revision: 25481

Log:
add FF_API_UDP_GET_FILE define to disable the deprecated udp_get_file_handle()
public function

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/avio.h
   trunk/libavformat/udp.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Fri Oct 15 14:45:14 2010	(r25480)
+++ trunk/libavformat/avformat.h	Fri Oct 15 14:49:48 2010	(r25481)
@@ -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

Modified: trunk/libavformat/avio.h
==============================================================================
--- trunk/libavformat/avio.h	Fri Oct 15 14:45:14 2010	(r25480)
+++ trunk/libavformat/avio.h	Fri Oct 15 14:49:48 2010	(r25481)
@@ -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
 

Modified: trunk/libavformat/udp.c
==============================================================================
--- trunk/libavformat/udp.c	Fri Oct 15 14:45:14 2010	(r25480)
+++ trunk/libavformat/udp.c	Fri Oct 15 14:49:48 2010	(r25481)
@@ -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)