[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [d459dfaf01bd37ee242be16f56b042e82ba2d192] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d459dfaf01bd37ee242be16f56b042e82ba2d192
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0350ed8590..930861da01 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -945,8 +945,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/3.4 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [a823657ee0123ec00d0fc2d21c1874cfa1b6d5bd] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a823657ee0123ec00d0fc2d21c1874cfa1b6d5bd
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 917202672c..555cd4415a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1129,8 +1129,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/4.2 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [7adacfd3e4356dce506f8baa7b7c28f23febb34c] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7adacfd3e4356dce506f8baa7b7c28f23febb34c
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index df499ffd6b..206138707d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1114,8 +1114,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/5.1 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [7207d398ff880c3687c75a4222785a6ad594702f] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7207d398ff880c3687c75a4222785a6ad594702f
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7507ffe47e..470307eca0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1130,8 +1130,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2024-04-14 Thread Michael Niedermayer 
ffmpeg | branch: release/6.0 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [21b22341ef9f6ffa05b43812d4047af49b223c35] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21b22341ef9f6ffa05b43812d4047af49b223c35
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index bcf850d350..71a29a1e6a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1131,8 +1131,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2023-12-29 Thread Michael Niedermayer 
ffmpeg | branch: release/6.1 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [f946c6c2f0799c5b88e48d44e282e919a19f988a] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f946c6c2f0799c5b88e48d44e282e919a19f988a
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index f7b5ec7a35..30cf7a15b0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1222,8 +1222,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2023-12-21 Thread Michael Niedermayer 
ffmpeg | branch: release/4.4 | Michael Niedermayer  | 
Sat Dec  2 00:26:03 2023 +0100| [6017705b36d80844a29cf8c28f14f81d5085e4ce] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4cdf2c7f768015c74078544d153f243b6d9b9ac5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6017705b36d80844a29cf8c28f14f81d5085e4ce
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2db8406a39..3f41706004 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1134,8 +1134,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: Ignore duplicate ftyp

2023-12-05 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Dec  2 00:26:03 2023 +0100| [4cdf2c7f768015c74078544d153f243b6d9b9ac5] | 
committer: Michael Niedermayer

avformat/mov: Ignore duplicate ftyp

Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cdf2c7f768015c74078544d153f243b6d9b9ac5
---

 libavformat/mov.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index f7b5ec7a35..30cf7a15b0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1222,8 +1222,12 @@ 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) {
+if (c->fc->strict_std_compliance >= FF_COMPLIANCE_STRICT)
+return AVERROR_INVALIDDATA;
+av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+return 0;
+}
 
 if (strcmp(type, "qt  "))
 c->isom = 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".