generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: remove FF_API_UDP_GET_FILE cruft

Browse Source
This commit is contained in:
Anton Khirnov
2011-02-03 12:39:11 +01:00
parent 61573bf1ba
commit c4efa7c229
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avio.h
View File

@@ -605,10 +605,6 @@ int avio_open_dyn_buf(AVIOContext **s);
*/ */
int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); 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. * Iterate through names of available protocols.
* *

5
libavformat/udp.c
View File

@@ -292,10 +292,7 @@ int ff_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 !FF_API_UDP_GET_FILE static int udp_get_file_handle(URLContext *h)
static
#endif
int udp_get_file_handle(URLContext *h)
{ {
UDPContext *s = h->priv_data; UDPContext *s = h->priv_data;
return s->udp_fd; return s->udp_fd;

3
libavformat/version.h
View File

@@ -47,9 +47,6 @@
#ifndef FF_API_URL_CLASS #ifndef FF_API_URL_CLASS
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
#endif #endif
#ifndef FF_API_UDP_GET_FILE
#define FF_API_UDP_GET_FILE (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_URL_SPLIT #ifndef FF_API_URL_SPLIT
#define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif