From c4efa7c22960588ff5163a1cfe026b48b8f6ec41 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 3 Feb 2011 12:39:11 +0100 Subject: [PATCH] lavf: remove FF_API_UDP_GET_FILE cruft --- libavformat/avio.h | 4 ---- libavformat/udp.c | 5 +---- libavformat/version.h | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index 82c2cec..2502711 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 b881ff9..e16dc4c 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 182bfb7..5042149 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 -- 2.7.4