Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Consistent with av_find_input_format().
pull/59/head
Stefano Sabatini 13 years ago
parent df531b0e10
commit 3cd4f9fd76
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/utils.c
  2. 2
      libavformat/version.h

2
libavformat/utils.c
Unescape View File

@ -226,7 +226,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
score_max = 0; score_max = 0;
while ((fmt = av_oformat_next(fmt))) { while ((fmt = av_oformat_next(fmt))) {
score = 0; 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; score += 100;
if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type)) if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
score += 10; score += 10;

2
libavformat/version.h
Unescape View File

@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 11 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \

Write Preview
Loading…
Cancel
Save