diff options
| author | Peter Ross <pross@xvid.org> | 2022-01-23 07:46:34 +0300 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2022-02-04 03:52:26 +0300 |
| commit | cc5eb2e66248c19bad1b9fa157540a28075544c2 (patch) | |
| tree | 26e45e096123472fc25ac43db8a3df6afb410a72 /libavformat/img2dec.c | |
| parent | 5903a4e32104ab343555b494991856fac5aa3aa2 (diff) | |
avformat/img2dec: increase probe score for GEM image fourcc variants
Signed-off-by: Peter Ross <pross@xvid.org>
Diffstat (limited to 'libavformat/img2dec.c')
| -rw-r--r-- | libavformat/img2dec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 2583ca2465..8608252d83 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -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) |