diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:37:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:37:58 +0200 |
| commit | 3ac3edf63baa2f550a004b2039e6fbd227801351 (patch) | |
| tree | 00ed7e349cd0b34ed3e82c2d9ff92e7c495e530e | |
| parent | c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4 (diff) | |
| parent | 86ea021b3a3b3f695284e159ca2f886b1c6d4867 (diff) | |
| download | ffmpeg-3ac3edf63baa2f550a004b2039e6fbd227801351.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Reduce probing score for flic animation files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flic.c b/libavformat/flic.c index 8d49116acf..2835cf557b 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -80,7 +80,7 @@ static int flic_probe(AVProbeData *p) return 0; - return AVPROBE_SCORE_MAX; + return AVPROBE_SCORE_MAX - 1; } static int flic_read_header(AVFormatContext *s) |