[FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants

[Peter Ross]

On Tue, Jan 25, 2022 at 06:26:23PM +1100, Peter Ross wrote:
> Signed-off-by: Peter Ross <pross at xvid.org>
> ---
>  libavformat/img2dec.c | 7 +++----
>  1 file 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)
> -- 
> 2.34.1

will apply in a couple of days too

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220202/3fbff3a4/attachment.sig>