diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 69d0054ada8a96406ebf95a8a935940d6279fd15..a21cfa4360c5bce517df864199d74dcf3f2762ed 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 45 +#define LIBAVFORMAT_VERSION_MINOR 46 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -1301,13 +1301,20 @@ void url_split(char *proto, int proto_size, char *path, int path_size, const char *url); +#if LIBAVFORMAT_VERSION_MAJOR < 53 +/** + * @deprecated Use av_match_ext() instead. + */ +attribute_deprecated int match_ext(const char *filename, const char *extensions); +#endif + /** * Returns a positive value if the given filename has one of the given * extensions, 0 otherwise. * * @param extensions a comma-separated list of filename extensions */ -int match_ext(const char *filename, const char *extensions); +int av_match_ext(const char *filename, const char *extensions); #endif /* HAVE_AV_CONFIG_H */ diff --git a/libavformat/utils.c b/libavformat/utils.c index a4c7219e1e9093f444d71f2535ab3579685016f3..316986cfdef44dc9ceba66adb811e37c08e1c91c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -137,7 +137,14 @@ void av_register_output_format(AVOutputFormat *format) format->next = NULL; } +#if LIBAVFORMAT_VERSION_MAJOR < 53 int match_ext(const char *filename, const char *extensions) +{ + return av_match_ext(filename, extensions); +} +#endif + +int av_match_ext(const char *filename, const char *extensions) { const char *ext, *p; char ext1[32], *q;