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 7e652a1e7f9fb81e8bc86d8c485fc79ba25d74b0..e6efc491d7bf38f17f1d870eb970360c0a9b8c3f 100644 (file)
--- 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 16397e4e90394b2f8aab49c90d0b380a8c4fb589..b0fa2eae252505db7349e280b885b4d851bff7d3 100644 (file)
--- 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);