Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Deprecate match_ext() in favor of av_match_ext(), and mark it for

Browse source 
deletion at the next major bump.

Originally committed as revision 20998 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-01-01 23:50:10 +00:00
parent 24b207b5a5
commit 8eb631fa50
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libavformat/avformat.h
View file

@ -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 */

7
libavformat/utils.c
View file

@ -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;