Commit 8ef30ac1 authored by Aurelien Jacobs's avatar Aurelien Jacobs

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
parent 198ac67f
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
#ifndef FF_API_GUESS_FORMAT #ifndef FF_API_GUESS_FORMAT
#define FF_API_GUESS_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_GUESS_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #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 * I return the LIBAVFORMAT_VERSION_INT constant. You got
......
...@@ -562,7 +562,7 @@ void init_checksum(ByteIOContext *s, ...@@ -562,7 +562,7 @@ void init_checksum(ByteIOContext *s,
/* udp.c */ /* udp.c */
int udp_set_remote_url(URLContext *h, const char *uri); int udp_set_remote_url(URLContext *h, const char *uri);
int udp_get_local_port(URLContext *h); 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); int udp_get_file_handle(URLContext *h);
#endif #endif
......
...@@ -276,7 +276,7 @@ int udp_get_local_port(URLContext *h) ...@@ -276,7 +276,7 @@ int udp_get_local_port(URLContext *h)
* streams at the same time. * streams at the same time.
* @param h media file context * @param h media file context
*/ */
#if (LIBAVFORMAT_VERSION_MAJOR >= 53) #if !FF_API_UDP_GET_FILE
static static
#endif #endif
int udp_get_file_handle(URLContext *h) int udp_get_file_handle(URLContext *h)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment