* [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp
@ 2023-12-01 23:26 Michael Niedermayer
2023-12-01 23:59 ` epirat07
0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer @ 2023-12-01 23:26 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@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;
+ }
if (strcmp(type, "qt "))
c->isom = 1;
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp
2023-12-01 23:26 [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp Michael Niedermayer
@ 2023-12-01 23:59 ` epirat07
2023-12-04 18:05 ` Dale Curtis
0 siblings, 1 reply; 4+ messages in thread
From: epirat07 @ 2023-12-01 23:59 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On 2 Dec 2023, at 0:26, Michael Niedermayer wrote:
> Fixes: switch_1080p_720p.mp4
> Found-by: Dale Curtis <dalecurtis@chromium.org>
> Signed-off-by: Michael Niedermayer <michael@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@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp
2023-12-01 23:59 ` epirat07
@ 2023-12-04 18:05 ` Dale Curtis
2023-12-05 11:13 ` Michael Niedermayer
0 siblings, 1 reply; 4+ messages in thread
From: Dale Curtis @ 2023-12-04 18:05 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Thanks! lgtm, defer to you on FF_COMPLIANCE_STRICT.
On Fri, Dec 1, 2023 at 3:59 PM <epirat07@gmail.com> wrote:
>
>
> On 2 Dec 2023, at 0:26, Michael Niedermayer wrote:
>
> > Fixes: switch_1080p_720p.mp4
> > Found-by: Dale Curtis <dalecurtis@chromium.org>
> > Signed-off-by: Michael Niedermayer <michael@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@ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp
2023-12-04 18:05 ` Dale Curtis
@ 2023-12-05 11:13 ` Michael Niedermayer
0 siblings, 0 replies; 4+ messages in thread
From: Michael Niedermayer @ 2023-12-05 11:13 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 307 bytes --]
On Mon, Dec 04, 2023 at 10:05:43AM -0800, Dale Curtis wrote:
> Thanks! lgtm, defer to you on FF_COMPLIANCE_STRICT.
applied with FF_COMPLIANCE_STRICT check
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
You can kill me, but you cannot change the truth.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-05 11:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-01 23:26 [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp Michael Niedermayer
2023-12-01 23:59 ` epirat07
2023-12-04 18:05 ` Dale Curtis
2023-12-05 11:13 ` Michael Niedermayer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git