virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avutil/avstring: Factor av_match_list() out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-30 19:00:52 +02:00
parent 6ea357ea83
commit 0d92b0d5f4
5 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2014-08-09
API changes, most recent first:
2014-10-02 - xxxxxxx - lavu 54.8.100 - avstring.h
Add av_match_list()
2014-09-24 - xxxxxxx - libpostproc 53.1.100
Add visualization support

20
libavformat/format.c
View File

@ -80,28 +80,14 @@ void av_register_output_format(AVOutputFormat *format)
int av_match_ext(const char *filename, const char *extensions)
{
const char *ext, *p;
char ext1[32], *q;
const char *ext;
if (!filename)
return 0;
ext = strrchr(filename, '.');
if (ext) {
ext++;
p = extensions;
for (;;) {
q = ext1;
while (*p != '\0' && *p != ',' && q - ext1 < sizeof(ext1) - 1)
*q++ = *p++;
*q = '\0';
if (!av_strcasecmp(ext1, ext))
return 1;
if (*p == '\0')
break;
p++;
}
}
if (ext)
return av_match_list(ext + 1, extensions, ',');
return 0;
}

21
libavutil/avstring.c
View File

@ -402,6 +402,27 @@ end:
return ret;
}
int av_match_list(const char *name, const char *list, char separator)
{
const char *p;
char ext1[128], *q;
int i;
p = list;
for (i = 1;; i++) {
q = ext1;
while (*p != '\0' && *p != separator && q - ext1 < sizeof(ext1) - 1)
*q++ = *p++;
*q = '\0';
if (!av_strcasecmp(ext1, name))
return i;
if (*p == '\0')
break;
p++;
}
return 0;
}
#ifdef TEST
int main(void)

7
libavutil/avstring.h
View File

@ -357,6 +357,13 @@ int av_escape(char **dst, const char *src, const char *special_chars,
int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
unsigned int flags);
/**
* Check if a name is in a list.
* @returns 0 if not found, or the 1 based index where it has been found in the
* list.
*/
int av_match_list(const char *name, const char *list, char separator);
/**
* @}
*/

4
libavutil/version.h
View File

@ -56,8 +56,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 54
#define LIBAVUTIL_VERSION_MINOR 7
#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_MINOR 8
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \