diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-14 20:38:55 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-15 08:04:28 -0400 |
| commit | 3e68b3ba7b015cf2154ad2023781eedd47f0f4bb (patch) | |
| tree | e8bb2171e7b2131883024b901941343998b84c07 /libavformat/aviobuf.c | |
| parent | 75b9ed04b977bfd467816f7e60c6511ef89b8a2b (diff) | |
| download | ffmpeg-3e68b3ba7b015cf2154ad2023781eedd47f0f4bb.tar.gz | |
avio: deprecate url_ferror
AVIOContext.error should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 6 |
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; |