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 /libavutil | |
| 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 'libavutil')
| -rw-r--r-- | libavutil/eval.h | 4 | ||||
| -rw-r--r-- | libavutil/parseutils.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/eval.h b/libavutil/eval.h index a1d1fe345c..6159b0fe58 100644 --- a/libavutil/eval.h +++ b/libavutil/eval.h @@ -45,7 +45,7 @@ typedef struct AVExpr AVExpr; * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2 * @param log_ctx parent logging context - * @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 otherwise */ int av_expr_parse_and_eval(double *res, const char *s, @@ -68,7 +68,7 @@ int av_expr_parse_and_eval(double *res, const char *s, * @param func2_names NULL terminated array of zero terminated strings of funcs2 identifiers * @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments * @param log_ctx parent logging context - * @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 otherwise */ int av_expr_parse(AVExpr **expr, const char *s, diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index 3eb35fc050..dcfb7056d6 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -127,7 +127,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, * @endcode * @param duration flag which tells how to interpret timestr, if not * zero timestr is interpreted as a duration, otherwise as a date - * @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 otherwise */ int av_parse_time(int64_t *timeval, const char *timestr, int duration); diff --git a/libavutil/version.h b/libavutil/version.h index 956187e765..9d089d8a5f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -76,7 +76,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 47 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |