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>tags/n2.1
@@ -498,7 +498,7 @@ int read_yesno(void); | |||||
* @param filename file to read from | * @param filename file to read from | ||||
* @param bufptr location where pointer to buffer is returned | * @param bufptr location where pointer to buffer is returned | ||||
* @param size location where size of buffer is returned | * @param size location where size of buffer is returned | ||||
* @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 error code in case of failure. | * AVERROR error code in case of failure. | ||||
*/ | */ | ||||
int cmdutils_read_file(const char *filename, char **bufptr, size_t *size); | int cmdutils_read_file(const char *filename, char **bufptr, size_t *size); | ||||
@@ -184,7 +184,7 @@ static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) | |||||
* | * | ||||
* @param avctx the AVCodecContext where to extract extra context to | * @param avctx the AVCodecContext where to extract extra context to | ||||
* @param avpkt the AVPacket to extract extra context from or NULL to use avctx | * @param avpkt the AVPacket to extract extra context from or NULL to use avctx | ||||
* @return 0 in case of success, a negative error code otherwise | |||||
* @return >= 0 in case of success, a negative error code otherwise | |||||
*/ | */ | ||||
static int extract_header(AVCodecContext *const avctx, | static int extract_header(AVCodecContext *const avctx, | ||||
const AVPacket *const avpkt) { | const AVPacket *const avpkt) { | ||||
@@ -30,7 +30,7 @@ | |||||
#define LIBAVCODEC_VERSION_MAJOR 55 | #define LIBAVCODEC_VERSION_MAJOR 55 | ||||
#define LIBAVCODEC_VERSION_MINOR 37 | #define LIBAVCODEC_VERSION_MINOR 37 | ||||
#define LIBAVCODEC_VERSION_MICRO 101 | |||||
#define LIBAVCODEC_VERSION_MICRO 102 | |||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | ||||
LIBAVCODEC_VERSION_MINOR, \ | LIBAVCODEC_VERSION_MINOR, \ | ||||
@@ -681,7 +681,7 @@ static void decode_decorrelation_matrix(WMAProDecodeCtx *s, | |||||
/** | /** | ||||
*@brief Decode channel transformation parameters | *@brief Decode channel transformation parameters | ||||
*@param s codec context | *@param s codec context | ||||
*@return 0 in case of success, < 0 in case of bitstream errors | |||||
*@return >= 0 in case of success, < 0 in case of bitstream errors | |||||
*/ | */ | ||||
static int decode_channel_transform(WMAProDecodeCtx* s) | static int decode_channel_transform(WMAProDecodeCtx* s) | ||||
{ | { | ||||
@@ -72,7 +72,7 @@ AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type, | |||||
* | * | ||||
* @param frame an already allocated AVFrame | * @param frame an already allocated AVFrame | ||||
* @param samplesref an audio buffer reference | * @param samplesref an audio buffer reference | ||||
* @return 0 in case of success, a negative AVERROR code in case of | |||||
* @return >= 0 in case of success, a negative AVERROR code in case of | |||||
* failure | * failure | ||||
* @deprecated Use avfilter_copy_buf_props() instead. | * @deprecated Use avfilter_copy_buf_props() instead. | ||||
*/ | */ | ||||
@@ -85,7 +85,7 @@ int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame, | |||||
* | * | ||||
* @param frame an already allocated AVFrame | * @param frame an already allocated AVFrame | ||||
* @param picref a video buffer reference | * @param picref a video buffer reference | ||||
* @return 0 in case of success, a negative AVERROR code in case of | |||||
* @return >= 0 in case of success, a negative AVERROR code in case of | |||||
* failure | * failure | ||||
* @deprecated Use avfilter_copy_buf_props() instead. | * @deprecated Use avfilter_copy_buf_props() instead. | ||||
*/ | */ | ||||
@@ -98,7 +98,7 @@ int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame, | |||||
* | * | ||||
* @param frame an already allocated AVFrame | * @param frame an already allocated AVFrame | ||||
* @param ref a video or audio buffer reference | * @param ref a video or audio buffer reference | ||||
* @return 0 in case of success, a negative AVERROR code in case of | |||||
* @return >= 0 in case of success, a negative AVERROR code in case of | |||||
* failure | * failure | ||||
* @deprecated Use avfilter_copy_buf_props() instead. | * @deprecated Use avfilter_copy_buf_props() instead. | ||||
*/ | */ | ||||
@@ -1316,7 +1316,7 @@ enum { | |||||
* | * | ||||
* @param graphctx the filter graph | * @param graphctx the filter graph | ||||
* @param log_ctx context used for logging | * @param log_ctx context used for logging | ||||
* @return 0 in case of success, a negative AVERROR code otherwise | |||||
* @return >= 0 in case of success, a negative AVERROR code otherwise | |||||
*/ | */ | ||||
int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx); | int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx); | ||||
@@ -224,7 +224,7 @@ FF_ENABLE_DEPRECATION_WARNINGS | |||||
* A graph is considered valid if all its input and output pads are | * A graph is considered valid if all its input and output pads are | ||||
* connected. | * connected. | ||||
* | * | ||||
* @return 0 in case of success, a negative value otherwise | |||||
* @return >= 0 in case of success, a negative value otherwise | |||||
*/ | */ | ||||
static int graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) | static int graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) | ||||
{ | { | ||||
@@ -262,7 +262,7 @@ static int graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) | |||||
/** | /** | ||||
* Configure all the links of graphctx. | * Configure all the links of graphctx. | ||||
* | * | ||||
* @return 0 in case of success, a negative value otherwise | |||||
* @return >= 0 in case of success, a negative value otherwise | |||||
*/ | */ | ||||
static int graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) | static int graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) | ||||
{ | { | ||||
@@ -89,7 +89,7 @@ static char *parse_link_name(const char **buf, void *log_ctx) | |||||
* @param filt_name the name of the filter to create | * @param filt_name the name of the filter to create | ||||
* @param args the arguments provided to the filter during its initialization | * @param args the arguments provided to the filter during its initialization | ||||
* @param log_ctx the log context to use | * @param log_ctx the log context to use | ||||
* @return 0 in case of success, a negative AVERROR code otherwise | |||||
* @return >= 0 in case of success, a negative AVERROR code otherwise | |||||
*/ | */ | ||||
static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int index, | static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int index, | ||||
const char *filt_name, const char *args, void *log_ctx) | const char *filt_name, const char *args, void *log_ctx) | ||||
@@ -152,7 +152,7 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind | |||||
* @param index an index which is assigned to the created filter | * @param index an index which is assigned to the created filter | ||||
* instance, and which is supposed to be unique for each filter | * instance, and which is supposed to be unique for each filter | ||||
* instance added to the filtergraph | * instance added to the filtergraph | ||||
* @return 0 in case of success, a negative AVERROR code otherwise | |||||
* @return >= 0 in case of success, a negative AVERROR code otherwise | |||||
*/ | */ | ||||
static int parse_filter(AVFilterContext **filt_ctx, const char **buf, AVFilterGraph *graph, | static int parse_filter(AVFilterContext **filt_ctx, const char **buf, AVFilterGraph *graph, | ||||
int index, void *log_ctx) | int index, void *log_ctx) | ||||
@@ -169,7 +169,7 @@ int ff_fmt_is_in(int fmt, const int *fmts); | |||||
* @param ret pixel format pointer to where the value should be written | * @param ret pixel format pointer to where the value should be written | ||||
* @param arg string to parse | * @param arg string to parse | ||||
* @param log_ctx log context | * @param log_ctx log context | ||||
* @return 0 in case of success, a negative AVERROR code on error | |||||
* @return >= 0 in case of success, a negative AVERROR code on error | |||||
*/ | */ | ||||
int ff_parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ctx); | int ff_parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ctx); | ||||
@@ -179,7 +179,7 @@ int ff_parse_pixel_format(enum AVPixelFormat *ret, const char *arg, void *log_ct | |||||
* @param ret unsigned integer pointer to where the value should be written | * @param ret unsigned integer pointer to where the value should be written | ||||
* @param arg string to parse | * @param arg string to parse | ||||
* @param log_ctx log context | * @param log_ctx log context | ||||
* @return 0 in case of success, a negative AVERROR code on error | |||||
* @return >= 0 in case of success, a negative AVERROR code on error | |||||
*/ | */ | ||||
int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx); | int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx); | ||||
@@ -189,7 +189,7 @@ int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx); | |||||
* @param ret unsigned AVRational pointer to where the value should be written | * @param ret unsigned AVRational pointer to where the value should be written | ||||
* @param arg string to parse | * @param arg string to parse | ||||
* @param log_ctx log context | * @param log_ctx log context | ||||
* @return 0 in case of success, a negative AVERROR code on error | |||||
* @return >= 0 in case of success, a negative AVERROR code on error | |||||
*/ | */ | ||||
int ff_parse_time_base(AVRational *ret, const char *arg, void *log_ctx); | int ff_parse_time_base(AVRational *ret, const char *arg, void *log_ctx); | ||||
@@ -199,7 +199,7 @@ int ff_parse_time_base(AVRational *ret, const char *arg, void *log_ctx); | |||||
* @param ret integer pointer to where the value should be written | * @param ret integer pointer to where the value should be written | ||||
* @param arg string to parse | * @param arg string to parse | ||||
* @param log_ctx log context | * @param log_ctx log context | ||||
* @return 0 in case of success, a negative AVERROR code on error | |||||
* @return >= 0 in case of success, a negative AVERROR code on error | |||||
*/ | */ | ||||
int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx); | int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx); | ||||
@@ -209,7 +209,7 @@ int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx); | |||||
* @param ret 64bit integer pointer to where the value should be written. | * @param ret 64bit integer pointer to where the value should be written. | ||||
* @param arg string to parse | * @param arg string to parse | ||||
* @param log_ctx log context | * @param log_ctx log context | ||||
* @return 0 in case of success, a negative AVERROR code on error | |||||
* @return >= 0 in case of success, a negative AVERROR code on error | |||||
*/ | */ | ||||
int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx); | int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx); | ||||
@@ -34,7 +34,7 @@ | |||||
* @param pix_fmt pointer to the pixel format of the loaded image | * @param pix_fmt pointer to the pixel format of the loaded image | ||||
* @param filename the name of the image file to load | * @param filename the name of the image file to load | ||||
* @param log_ctx log context | * @param log_ctx log context | ||||
* @return 0 in case of success, a negative error code otherwise. | |||||
* @return >= 0 in case of success, a negative error code otherwise. | |||||
*/ | */ | ||||
int ff_load_image(uint8_t *data[4], int linesize[4], | int ff_load_image(uint8_t *data[4], int linesize[4], | ||||
int *w, int *h, enum AVPixelFormat *pix_fmt, | int *w, int *h, enum AVPixelFormat *pix_fmt, | ||||
@@ -31,7 +31,7 @@ | |||||
#define LIBAVFILTER_VERSION_MAJOR 3 | #define LIBAVFILTER_VERSION_MAJOR 3 | ||||
#define LIBAVFILTER_VERSION_MINOR 88 | #define LIBAVFILTER_VERSION_MINOR 88 | ||||
#define LIBAVFILTER_VERSION_MICRO 101 | |||||
#define LIBAVFILTER_VERSION_MICRO 102 | |||||
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | ||||
LIBAVFILTER_VERSION_MINOR, \ | LIBAVFILTER_VERSION_MINOR, \ | ||||
@@ -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. | * In case of failure the pointed to value is set to NULL. | ||||
* @param flags flags which control how the resource indicated by url | * @param flags flags which control how the resource indicated by url | ||||
* is to be opened | * 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 | * AVERROR code in case of failure | ||||
*/ | */ | ||||
int avio_open(AVIOContext **s, const char *url, int flags); | 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 | * @param options A dictionary filled with protocol-private options. On return | ||||
* this parameter will be destroyed and replaced with a dict containing options | * this parameter will be destroyed and replaced with a dict containing options | ||||
* that were not found. May be NULL. | * 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 | * AVERROR code in case of failure | ||||
*/ | */ | ||||
int avio_open2(AVIOContext **s, const char *url, int flags, | int avio_open2(AVIOContext **s, const char *url, int flags, | ||||
@@ -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 s The read-only AVIOContext to rewind | ||||
* @param buf The probe buffer containing the first buf_size bytes of the file | * @param buf The probe buffer containing the first buf_size bytes of the file | ||||
* @param buf_size The size of buf | * @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 | * AVERROR code in case of failure | ||||
*/ | */ | ||||
int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char **buf, int buf_size); | 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. | * @param s Used to return the pointer to the created AVIOContext. | ||||
* In case of failure the pointed to value is set to NULL. | * 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 | * AVERROR code in case of failure | ||||
*/ | */ | ||||
int ffio_fdopen(AVIOContext **s, URLContext *h); | int ffio_fdopen(AVIOContext **s, URLContext *h); | ||||
@@ -101,7 +101,7 @@ typedef struct URLProtocol { | |||||
* is to be opened | * is to be opened | ||||
* @param int_cb interrupt callback to use for the URLContext, may be | * @param int_cb interrupt callback to use for the URLContext, may be | ||||
* NULL | * 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 | * AVERROR code in case of failure | ||||
*/ | */ | ||||
int ffurl_alloc(URLContext **puc, const char *filename, int flags, | 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 | * @param options A dictionary filled with protocol-private options. On return | ||||
* this parameter will be destroyed and replaced with a dict containing options | * this parameter will be destroyed and replaced with a dict containing options | ||||
* that were not found. May be NULL. | * 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 | * AVERROR code in case of failure | ||||
*/ | */ | ||||
int ffurl_open(URLContext **puc, const char *filename, int flags, | int ffurl_open(URLContext **puc, const char *filename, int flags, | ||||
@@ -31,7 +31,7 @@ | |||||
#define LIBAVFORMAT_VERSION_MAJOR 55 | #define LIBAVFORMAT_VERSION_MAJOR 55 | ||||
#define LIBAVFORMAT_VERSION_MINOR 19 | #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, \ | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | ||||
LIBAVFORMAT_VERSION_MINOR, \ | LIBAVFORMAT_VERSION_MINOR, \ | ||||
@@ -45,7 +45,7 @@ typedef struct AVExpr AVExpr; | |||||
* @param funcs2 NULL terminated array of function pointers for functions which take 2 arguments | * @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 opaque a pointer which will be passed to all functions from funcs1 and funcs2 | ||||
* @param log_ctx parent logging context | * @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 | * AVERROR code otherwise | ||||
*/ | */ | ||||
int av_expr_parse_and_eval(double *res, const char *s, | 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 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 funcs2 NULL terminated array of function pointers for functions which take 2 arguments | ||||
* @param log_ctx parent logging context | * @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 | * AVERROR code otherwise | ||||
*/ | */ | ||||
int av_expr_parse(AVExpr **expr, const char *s, | int av_expr_parse(AVExpr **expr, const char *s, | ||||
@@ -127,7 +127,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, | |||||
* @endcode | * @endcode | ||||
* @param duration flag which tells how to interpret timestr, if not | * @param duration flag which tells how to interpret timestr, if not | ||||
* zero timestr is interpreted as a duration, otherwise as a date | * 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 | * AVERROR code otherwise | ||||
*/ | */ | ||||
int av_parse_time(int64_t *timeval, const char *timestr, int duration); | int av_parse_time(int64_t *timeval, const char *timestr, int duration); | ||||
@@ -76,7 +76,7 @@ | |||||
#define LIBAVUTIL_VERSION_MAJOR 52 | #define LIBAVUTIL_VERSION_MAJOR 52 | ||||
#define LIBAVUTIL_VERSION_MINOR 47 | #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, \ | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | ||||
LIBAVUTIL_VERSION_MINOR, \ | LIBAVUTIL_VERSION_MINOR, \ | ||||