avio: deprecate url_ferror

AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index d0f63df3d2..4f39fe3529 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -272,7 +272,6 @@ int url_feof(AVIOContext *s)
         return 0;
     return s->eof_reached;
 }
-#endif
 
 int url_ferror(AVIOContext *s)
 {
@@ -280,6 +279,7 @@ int url_ferror(AVIOContext *s)
         return 0;
     return s->error;
 }
+#endif
 
 void avio_wl32(AVIOContext *s, unsigned int val)
 {
@@ -599,7 +599,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
         }
     }
     if (size1 == size) {
-        if (url_ferror(s)) return url_ferror(s);
+        if (s->error)         return s->error;
         if (s->eof_reached)   return AVERROR_EOF;
     }
     return size1 - size;
@@ -622,7 +622,7 @@ int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size)
     memcpy(buf, s->buf_ptr, len);
     s->buf_ptr += len;
     if (!len) {
-        if (url_ferror(s)) return url_ferror(s);
+        if (s->error)         return s->error;
         if (s->eof_reached)   return AVERROR_EOF;
     }
     return len;