aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2010-11-04 13:53:16 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-11-04 13:53:16 +0000
commit37e9cc4ec760b997ec075a9b2afe340ad2a8059c (patch)
treee31dd9bde21ab675c18b9de1de1dcd029b2e2571
parentf1c7c6aee8ddeda87a6b7a4d909a8e14ea3e1e24 (diff)
downloadffmpeg-37e9cc4ec760b997ec075a9b2afe340ad2a8059c.tar.gz
Remove two instances of AVERROR(ff_neterrno()), because ff_neterrno() itself
already does AVERROR(). Originally committed as revision 25671 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 12792b5470..4ab64e4549 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -155,7 +155,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
if (len < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN))
- return AVERROR(ff_neterrno());
+ return ff_neterrno();
} else return len;
} else if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
@@ -187,7 +187,7 @@ static int tcp_write(URLContext *h, const uint8_t *buf, int size)
if (len < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN))
- return AVERROR(ff_neterrno());
+ return ff_neterrno();
continue;
}
size -= len;