diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 12:49:48 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 12:49:48 +0000 |
| commit | 8ef30ac1f309fcf87c4df92e71c890f48cc199bb (patch) | |
| tree | 0e4f0050c6fd22336fe80ef55378755e23ae4741 | |
| parent | 198ac67fe843f55535b75bd3f17b3a1b7ee847b6 (diff) | |
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
| -rw-r--r-- | libavformat/avformat.h | 3 | ||||
| -rw-r--r-- | libavformat/avio.h | 2 | ||||
| -rw-r--r-- | libavformat/udp.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 89a4102fd1..d121b59e37 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 118b7f27c9..e4fd601724 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 2200c549ca..b998086407 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) |