From 1a70d12727dc63ffe890362ce755213cdb647df1 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 31 Mar 2010 19:03:03 +0000 Subject: [PATCH] Make av_match_ext() declaration public (move its declaration out of the #ifdef HAVE_AV_CONFIG_H block in avformat.h). Originally committed as revision 22748 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d306355..22f74b4 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 59 +#define LIBAVFORMAT_VERSION_MINOR 60 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -1327,6 +1327,14 @@ int av_filename_number_test(const char *filename); */ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size); +/** + * 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 av_match_ext(const char *filename, const char *extensions); + #ifdef HAVE_AV_CONFIG_H void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem); @@ -1351,14 +1359,6 @@ struct tm *brktimegm(time_t secs, struct tm *tm); const char *small_strptime(const char *p, const char *fmt, struct tm *dt); -/** - * 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 av_match_ext(const char *filename, const char *extensions); - #endif /* HAVE_AV_CONFIG_H */ #endif /* AVFORMAT_AVFORMAT_H */ -- 2.7.4