diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-01-13 11:09:43 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-29 16:54:18 +0200 |
| commit | 3cd4f9fd76d626f3168393b55549440a2cb8e716 (patch) | |
| tree | bb45930126791e552f800932e0b590a4f01a07e6 | |
| parent | df531b0e1004cdc76e656465d84ede7cfd9e370a (diff) | |
| download | ffmpeg-3cd4f9fd76d626f3168393b55549440a2cb8e716.tar.gz | |
lavf: allow multiple names in output devices selected by av_guess_format()
Consistent with av_find_input_format().
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 1a586ad2bb..27804b8585 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -226,7 +226,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, score_max = 0; while ((fmt = av_oformat_next(fmt))) { score = 0; - if (fmt->name && short_name && !av_strcasecmp(fmt->name, short_name)) + if (fmt->name && short_name && match_format(short_name, fmt->name)) score += 100; if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type)) score += 10; diff --git a/libavformat/version.h b/libavformat/version.h index 6562061d6a..34b8a075b1 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 11 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |