mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-02 06:23:23 +02:00
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>
This commit is contained in:
commit
4c404611da
@ -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;
|
||||
}
|
||||
|
||||
/************************************************************/
|
||||
|
Loading…
Reference in New Issue
Block a user