diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 12:53:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 12:53:26 +0200 |
| commit | 2dbc93455c148bbd051549a7ed5c88fb08c853c5 (patch) | |
| tree | 41461a4365556582fe991c06ed4624d4767ef05d /libavformat/network.h | |
| parent | cccb45751e93142d71be78f6bb90bbfb50ee13be (diff) | |
| parent | 80521c1997a23e148edf89e11b939ab8646297ca (diff) | |
| download | ffmpeg-2dbc93455c148bbd051549a7ed5c88fb08c853c5.tar.gz | |
Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'
* commit '80521c1997a23e148edf89e11b939ab8646297ca':
build: allow targets to specify extra objects to link with executables
swscale: avoid pointless use of compound literals
libm: add fallbacks for various single-precision functions
network: use getservbyport() only if available
network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
Include sys/time.h before sys/resource.h
Conflicts:
Makefile
configure
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index a766d03fcd..f8b4dee50e 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -201,6 +201,14 @@ const char *ff_gai_strerror(int ecode); #define gai_strerror ff_gai_strerror #endif +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK 0x7f000001 +#endif + +#ifndef INET_ADDRSTRLEN +#define INET_ADDRSTRLEN 16 +#endif + #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN INET_ADDRSTRLEN #endif |