diff options
| author | Martin Storsjö <martin@martin.st> | 2011-02-19 19:14:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-23 18:22:03 +0100 |
| commit | c24a40349693e50aa81ef68a4a522503ca504d50 (patch) | |
| tree | 155a362ee2fcc37441f2b96981b9fa25a3892b20 /libavformat/rtsp.c | |
| parent | 8e35f5d4fad523c1a1f0a4d9e4b74e7f1c5b990d (diff) | |
libavformat: Remove FF_NETERRNO()
Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR()
error codes. Provide fallback definitions of other errno.h network
errors, mapping them to the corresponding winsock errors.
This eases catching these error codes in common code, without having
to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN).
This fixes roundup issue 2614, unbreaking blocking network IO on
windows.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 28c4741a6617a4c1d2490cb13fc70ae4c9c472da)
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index bc8cd67c81..62311cbb23 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1528,7 +1528,7 @@ redirect: goto fail; lower_transport_mask &= ~(1 << lower_transport); if (lower_transport_mask == 0 && err == 1) { - err = FF_NETERROR(EPROTONOSUPPORT); + err = AVERROR(EPROTONOSUPPORT); goto fail; } } while (err); @@ -1615,7 +1615,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, } #endif } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) { - return FF_NETERROR(ETIMEDOUT); + return AVERROR(ETIMEDOUT); } else if (n < 0 && errno != EINTR) return AVERROR(errno); } |