RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/img2dec: increase probe score for GEM image fourcc variants 

Signed-off-by: Peter Ross <pross@xvid.org>
This commit is contained in:
Peter Ross 2022-01-23 15:46:34 +11:00
parent 5903a4e321
commit cc5eb2e662
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/img2dec.c
View File

@ -1112,7 +1112,6 @@ static int photocd_probe(const AVProbeData *p)
static int gem_probe(const AVProbeData *p)
{
const uint8_t *b = p->buf;
int ret = 0;
if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 &&
AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 &&
(AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */
@ -1121,13 +1120,13 @@ static int gem_probe(const AVProbeData *p)
AV_RB16(b + 10) &&
AV_RB16(b + 12) &&
AV_RB16(b + 14)) {
ret = AVPROBE_SCORE_EXTENSION / 4;
if (AV_RN32(b + 16) == AV_RN32("STTT") ||
AV_RN32(b + 16) == AV_RN32("TIMG") ||
AV_RN32(b + 16) == AV_RN32("XIMG"))
ret += 1;
return AVPROBE_SCORE_EXTENSION + 1;
return AVPROBE_SCORE_EXTENSION / 4;
}
return ret;
return 0;
}
#define IMAGEAUTO_DEMUXER_0(imgname, codecid)