diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:39:11 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:38 +0200 |
| commit | c4efa7c22960588ff5163a1cfe026b48b8f6ec41 (patch) | |
| tree | 051fa52b43b77b3a547cde50075f159caac20e19 | |
| parent | 61573bf1ba50dc8828d0e87d913389fbcff48509 (diff) | |
| download | ffmpeg-c4efa7c22960588ff5163a1cfe026b48b8f6ec41.tar.gz | |
lavf: remove FF_API_UDP_GET_FILE cruft
| -rw-r--r-- | libavformat/avio.h | 4 | ||||
| -rw-r--r-- | libavformat/udp.c | 5 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 82c2cece07..2502711be5 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -605,10 +605,6 @@ int avio_open_dyn_buf(AVIOContext **s); */ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); -#if FF_API_UDP_GET_FILE -int udp_get_file_handle(URLContext *h); -#endif - /** * Iterate through names of available protocols. * diff --git a/libavformat/udp.c b/libavformat/udp.c index b881ff95fd..e16dc4c7e0 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -292,10 +292,7 @@ int ff_udp_get_local_port(URLContext *h) * streams at the same time. * @param h media file context */ -#if !FF_API_UDP_GET_FILE -static -#endif -int udp_get_file_handle(URLContext *h) +static int udp_get_file_handle(URLContext *h) { UDPContext *s = h->priv_data; return s->udp_fd; diff --git a/libavformat/version.h b/libavformat/version.h index 182bfb7814..50421495bb 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ #ifndef FF_API_URL_CLASS #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #endif -#ifndef FF_API_UDP_GET_FILE -#define FF_API_UDP_GET_FILE (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_URL_SPLIT #define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53) #endif |