[FFmpeg-cvslog] lavf: allow multiple names in output devices selected by av_guess_format()

Stefano Sabatini git at videolan.org
Fri Jun 29 17:11:37 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Jan 13 11:09:43 2012 +0100| [3cd4f9fd76d626f3168393b55549440a2cb8e716] | committer: Stefano Sabatini

lavf: allow multiple names in output devices selected by av_guess_format()

Consistent with av_find_input_format().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cd4f9fd76d626f3168393b55549440a2cb8e716
---

 libavformat/utils.c   |    2 +-
 libavformat/version.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1a586ad..27804b8 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 6562061..34b8a07 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, \



More information about the ffmpeg-cvslog mailing list