1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-09 23:48:13 +03:00

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Reduce probing score for flic animation files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-15 11:37:51 +02:00

View File

@@ -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)