aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2010-04-16 00:20:11 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2010-04-16 00:20:11 +0000
commitadef229efbf0cb2e9a8650b1e3bec03b47aea179 (patch)
tree0a756363b97c7e38acff683671b4edc41076e8b6
parent4aecee7fc34d5eb3dccf2b8ff070cd1029a14d96 (diff)
downloadffmpeg-adef229efbf0cb2e9a8650b1e3bec03b47aea179.tar.gz
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
-rw-r--r--cmdutils.c2
-rw-r--r--libavformat/rtsp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 7e652a1e7f..e6efc491d7 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 16397e4e90..b0fa2eae25 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);