diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 01:58:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 01:58:09 +0200 |
| commit | b536e2facfa0872adeb6aaae4189f9b90d907e36 (patch) | |
| tree | 3649d9dd83aa7e0ed617ce3de4a1b7020ef89251 /libavformat/network.h | |
| parent | 5916bc46581230c68c946c0b4733cce381eddcbd (diff) | |
| parent | c29c1a1b6bade2b9118c7fa01239c622c2238656 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: add an assert to silence an uninitialized variable warning.
avconv: shut up an uninitialized variable warning.
avfiltergraph: shut up uninitialized variable warning.
af_join: initialize a variable to shut up gcc warning.
amix: fix format specifier for AVFilterLink.sample_rate.
lavfi: make filters less verbose.
mpc8: read APE tags.
lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
libm: provide fallback definition for cbrtf() using powf()
network: Don't redefine error codes if they already exist in errno.h
configure: Check for sys/time.h
network: Include unistd.h from network.h
avconv: don't include vsrc_buffer.h, which doesn't exist anymore
lavfi: reorder AVFilterLink fields.
lavfi: reorder AVFilterContext fields.
lavfi: reorder AVFilter fields.
lavfi: reorder AVFilterBufferRef fields.
lavfi: reorder AVFilterBuffer fields.
Conflicts:
configure
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_crop.c
libavfilter/vf_drawbox.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c
libavformat/network.h
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index d890e7c060..33cd517b51 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -27,26 +27,27 @@ #include "libavutil/error.h" #include "os_support.h" +#if HAVE_UNISTD_H +#include <unistd.h> +#endif + #if HAVE_WINSOCK2_H #include <winsock2.h> #include <ws2tcpip.h> -#ifdef EPROTONOSUPPORT -# undef EPROTONOSUPPORT -#endif +#ifndef EPROTONOSUPPORT #define EPROTONOSUPPORT WSAEPROTONOSUPPORT -#ifdef ETIMEDOUT -# undef ETIMEDOUT #endif +#ifndef ETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT -#ifdef ECONNREFUSED -# undef ECONNREFUSED #endif +#ifndef ECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED -#ifdef EINPROGRESS -# undef EINPROGRESS #endif +#ifndef EINPROGRESS #define EINPROGRESS WSAEINPROGRESS +#endif + #define getsockopt(a, b, c, d, e) getsockopt(a, b, c, (char*) d, e) #define setsockopt(a, b, c, d, e) setsockopt(a, b, c, (const char*) d, e) |