[SCM] libav/experimental: AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x) FF_NETERROR is implicitly an AVERROR.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit adef229efbf0cb2e9a8650b1e3bec03b47aea179
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Fri Apr 16 00:20:11 2010 +0000

    AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x)
    FF_NETERROR is implicitly an AVERROR.
    
    Originally committed as revision 22888 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/cmdutils.c b/cmdutils.c
index 7e652a1..e6efc49 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -295,7 +295,7 @@ void print_error(const char *filename, int err)
 
     switch(err) {
 #if CONFIG_NETWORK
-    case AVERROR(FF_NETERROR(EPROTONOSUPPORT)):
+    case FF_NETERROR(EPROTONOSUPPORT):
         fprintf(stderr, "%s: Unsupported network protocol\n", filename);
         break;
 #endif
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 16397e4..b0fa2ea 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1583,7 +1583,7 @@ redirect:
             goto fail;
         lower_transport_mask &= ~(1 << lower_transport);
         if (lower_transport_mask == 0 && err == 1) {
-            err = AVERROR(FF_NETERROR(EPROTONOSUPPORT));
+            err = FF_NETERROR(EPROTONOSUPPORT);
             goto fail;
         }
     } while (err);

-- 
Libav/FFmpeg packaging