[FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp

[Dale Curtis]

Thanks! lgtm, defer to you on FF_COMPLIANCE_STRICT.

On Fri, Dec 1, 2023 at 3:59 PM <epirat07 at gmail.com> wrote:

>
>
> On 2 Dec 2023, at 0:26, Michael Niedermayer wrote:
>
> > Fixes: switch_1080p_720p.mp4
> > Found-by: Dale Curtis <dalecurtis at chromium.org>
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/mov.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/mov.c b/libavformat/mov.c
> > index f7b5ec7a352..fb5d6f49138 100644
> > --- a/libavformat/mov.c
> > +++ b/libavformat/mov.c
> > @@ -1222,8 +1222,10 @@ static int mov_read_ftyp(MOVContext *c,
> AVIOContext *pb, MOVAtom atom)
> >      int ret = ffio_read_size(pb, type, 4);
> >      if (ret < 0)
> >          return ret;
> > -    if (c->fc->nb_streams)
> > -        return AVERROR_INVALIDDATA;
> > +    if (c->fc->nb_streams) {
> > +        av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
> > +        return 0;
> > +    }
> >
>
> Should this be an error when FF_COMPLIANCE_STRICT maybe?
>
> >      if (strcmp(type, "qt  "))
> >          c->isom = 1;
> > --
> > 2.17.1
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>