Browse Source

lavf: remove FF_API_UDP_GET_FILE cruft

tags/n0.8
Anton Khirnov 14 years ago
parent
commit
c4efa7c229
3 changed files with 1 additions and 11 deletions
  1. +0
    -4
      libavformat/avio.h
  2. +1
    -4
      libavformat/udp.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 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);

#if FF_API_UDP_GET_FILE
int udp_get_file_handle(URLContext *h);
#endif

/**
* Iterate through names of available protocols.
*


+ 1
- 4
libavformat/udp.c View File

@@ -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;


+ 0
- 3
libavformat/version.h View File

@@ -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


Loading…
Cancel
Save