[SCM] libav/experimental: Remove two instances of AVERROR(ff_neterrno()), because ff_neterrno() itself already does AVERROR().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:18:37 UTC 2013


The following commit has been merged in the experimental branch:
commit 37e9cc4ec760b997ec075a9b2afe340ad2a8059c
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Thu Nov 4 13:53:16 2010 +0000

    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

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 12792b5..4ab64e4 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list