diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-15 15:25:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-19 16:42:57 +0200 |
| commit | d5ec8ba7f2cb83a166da196c377398b7954c5d6c (patch) | |
| tree | 8c610840757a2274259a65bfe58a421d41e1311c /libavformat | |
| parent | a6388616e826437acd749e81671b386e0609f549 (diff) | |
| download | ffmpeg-d5ec8ba7f2cb83a166da196c377398b7954c5d6c.tar.gz | |
Do not leave positive values undefined when negative are defined as error
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.h | 4 | ||||
| -rw-r--r-- | libavformat/avio_internal.h | 4 | ||||
| -rw-r--r-- | libavformat/url.h | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 5bdbc62836..4f4ac3cbaf 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -368,7 +368,7 @@ int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen); * In case of failure the pointed to value is set to NULL. * @param flags flags which control how the resource indicated by url * is to be opened - * @return 0 in case of success, a negative value corresponding to an + * @return >= 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int avio_open(AVIOContext **s, const char *url, int flags); @@ -387,7 +387,7 @@ int avio_open(AVIOContext **s, const char *url, int flags); * @param options A dictionary filled with protocol-private options. On return * this parameter will be destroyed and replaced with a dict containing options * that were not found. May be NULL. - * @return 0 in case of success, a negative value corresponding to an + * @return >= 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int avio_open2(AVIOContext **s, const char *url, int flags, diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index c5a2a96014..8441d49971 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -78,7 +78,7 @@ static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s) * @param s The read-only AVIOContext to rewind * @param buf The probe buffer containing the first buf_size bytes of the file * @param buf_size The size of buf - * @return 0 in case of success, a negative value corresponding to an + * @return >= 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char **buf, int buf_size); @@ -125,7 +125,7 @@ int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size); * * @param s Used to return the pointer to the created AVIOContext. * In case of failure the pointed to value is set to NULL. - * @return 0 in case of success, a negative value corresponding to an + * @return >= 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int ffio_fdopen(AVIOContext **s, URLContext *h); diff --git a/libavformat/url.h b/libavformat/url.h index 06dfda111d..686fe29410 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -101,7 +101,7 @@ typedef struct URLProtocol { * is to be opened * @param int_cb interrupt callback to use for the URLContext, may be * NULL - * @return 0 in case of success, a negative value corresponding to an + * @return >= 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int ffurl_alloc(URLContext **puc, const char *filename, int flags, @@ -130,7 +130,7 @@ int ffurl_connect(URLContext *uc, AVDictionary **options); * @param options A dictionary filled with protocol-private options. On return * this parameter will be destroyed and replaced with a dict containing options * that were not found. May be NULL. - * @return 0 in case of success, a negative value corresponding to an + * @return >= 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int ffurl_open(URLContext **puc, const char *filename, int flags, diff --git a/libavformat/version.h b/libavformat/version.h index ff38e9605d..b62687b4af 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 19 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |