diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-09-13 01:46:29 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2011-09-16 00:42:47 +0200 |
| commit | 9899037dc6b246f2eeb7e0255c316749372fe1ae (patch) | |
| tree | f3aa2650d5fb63f567fd31fe1edabda917480203 /libavfilter/avfilter.h | |
| parent | 98b906e1af789e9bc9930c2d2bfa3d0798405e21 (diff) | |
lavfi: rename avfilter_all_* function names to avfilter_make_all_*
A function name should tell what the function does rather than what
the function returns. This also avoids possible conflicts
(e.g. between a function and a public list of all supported formats),
and clarifies the code.
Breaks audio API/ABI, add a backward compatibility layer for video
API/ABI.
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 90bb4d17fb..a8426fea53 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -29,7 +29,7 @@ #include "libavutil/rational.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 40 +#define LIBAVFILTER_VERSION_MINOR 41 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -43,6 +43,9 @@ #ifndef FF_API_OLD_VSINK_API #define FF_API_OLD_VSINK_API (LIBAVUTIL_VERSION_MAJOR < 3) #endif +#ifndef FF_API_OLD_ALL_FORMATS_API +#define FF_API_OLD_ALL_FORMATS_API (LIBAVUTIL_VERSION_MAJOR < 3) +#endif #include <stddef.h> @@ -258,20 +261,28 @@ AVFilterFormats *avfilter_make_format64_list(const int64_t *fmts); */ int avfilter_add_format(AVFilterFormats **avff, int64_t fmt); +#if FF_API_OLD_ALL_FORMATS_API /** - * Return a list of all formats supported by FFmpeg for the given media type. + * @deprecated Use avfilter_make_all_formats() instead. */ +attribute_deprecated AVFilterFormats *avfilter_all_formats(enum AVMediaType type); +#endif + +/** + * Return a list of all formats supported by FFmpeg for the given media type. + */ +AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type); /** * Return a list of all channel layouts supported by FFmpeg. */ -AVFilterFormats *avfilter_all_channel_layouts(void); +AVFilterFormats *avfilter_make_all_channel_layouts(void); /** * Return a list of all audio packing formats. */ -AVFilterFormats *avfilter_all_packing_formats(void); +AVFilterFormats *avfilter_make_all_packing_formats(void); /** * Return a format list which contains the intersection of the formats of |