diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 14:16:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 14:17:35 +0400 |
| commit | 4c404611dae4a8fe41b348b8d5db4ea526e24bc5 (patch) | |
| tree | ab0733f41b30dcf0130893a6718e84985f272d86 | |
| parent | 7c73d215231adcf81c03c95caf5ed1f0c33c727b (diff) | |
| parent | ef17a0c7ba005fafd05e7d9f0ff294a59265a2dc (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 6ebbe6cbd9..d4f369bfa7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -278,11 +278,11 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, if (!strcmp(fmt->name, fmt_id_type[i].name)) { st->codec->codec_id = fmt_id_type[i].id; st->codec->codec_type = fmt_id_type[i].type; - break; + return score; } } } - return score; + return 0; } /************************************************************/ |