[FFmpeg-cvslog] r22888 - in trunk: cmdutils.c libavformat/rtsp.c

[ramiro]

Author: ramiro
Date: Fri Apr 16 02:20:11 2010
New Revision: 22888

Log:
AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x)
FF_NETERROR is implicitly an AVERROR.

Modified:
   trunk/cmdutils.c
   trunk/libavformat/rtsp.c

Modified: trunk/cmdutils.c
==============================================================================
--- trunk/cmdutils.c	Thu Apr 15 20:27:27 2010	(r22887)
+++ trunk/cmdutils.c	Fri Apr 16 02:20:11 2010	(r22888)
@@ -295,7 +295,7 @@ void print_error(const char *filename, i
 
     switch(err) {
 #if CONFIG_NETWORK
-    case AVERROR(FF_NETERROR(EPROTONOSUPPORT)):
+    case FF_NETERROR(EPROTONOSUPPORT):
         fprintf(stderr, "%s: Unsupported network protocol\n", filename);
         break;
 #endif

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Thu Apr 15 20:27:27 2010	(r22887)
+++ trunk/libavformat/rtsp.c	Fri Apr 16 02:20:11 2010	(r22888)
@@ -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);