diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 18:18:40 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 18:48:42 +0300 |
| commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
| tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/avio.h | |
| parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
| parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio.h')
| -rw-r--r-- | libavformat/avio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index dd4380e4f4..20b5e80e38 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -237,7 +237,7 @@ void url_get_filename(URLContext *h, char *buf, int buf_size); /** * The callback is called in blocking functions to test regulary if - * asynchronous interruption is needed. AVERROR(EINTR) is returned + * asynchronous interruption is needed. AVERROR_EXIT is returned * in this case by the interrupted function. 'NULL' means no interrupt * callback is given. */ @@ -432,6 +432,8 @@ attribute_deprecated int url_fgetc(AVIOContext *s); /** * @} */ + +attribute_deprecated int url_ferror(AVIOContext *s); #endif AVIOContext *avio_alloc_context( @@ -500,8 +502,6 @@ int64_t avio_size(AVIOContext *s); */ int url_feof(AVIOContext *s); -int url_ferror(AVIOContext *s); - int av_url_read_fpause(AVIOContext *h, int pause); int64_t av_url_read_fseek(AVIOContext *h, int stream_index, int64_t timestamp, int flags); |