The branch, master has been updated
via c0044ec9c4e5eacb5aa58a75f67b1ad857147437 (commit)
from 9e09be513d81d66cddcdd53827c850d13c2319b3 (commit)
- Log -----------------------------------------------------------------
commit c0044ec9c4e5eacb5aa58a75f67b1ad857147437
Author: James Almer <[email protected]>
AuthorDate: Fri Nov 21 16:58:13 2025 -0300
Commit: Zhao Zhili <[email protected]>
CommitDate: Sun Nov 23 11:51:26 2025 +0000
avformat/mov: don't parse reserved ISOBMFF fields as if they were QT
Signed-off-by: James Almer <[email protected]>
diff --git a/libavformat/mov.c b/libavformat/mov.c
index eab9f79577..a3e1ba0a31 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2678,12 +2678,18 @@ static void mov_parse_stsd_video(MOVContext *c,
AVIOContext *pb,
* read in ff_mov_read_stsd_entries() */
stsd_start = avio_tell(pb) - 16;
+ if (c->isom) {
+ avio_skip(pb, 2); /* pre_defined */
+ avio_skip(pb, 2); /* reserved */
+ avio_skip(pb, 12); /* pre_defined */
+ } else {
avio_rb16(pb); /* version */
avio_rb16(pb); /* revision level */
id = avio_rl32(pb); /* vendor */
av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0);
avio_rb32(pb); /* temporal quality */
avio_rb32(pb); /* spatial quality */
+ }
st->codecpar->width = avio_rb16(pb); /* width */
st->codecpar->height = avio_rb16(pb); /* height */
@@ -2733,9 +2739,13 @@ static void mov_parse_stsd_audio(MOVContext *c,
AVIOContext *pb,
AVDictionaryEntry *compatible_brands = av_dict_get(c->fc->metadata,
"compatible_brands", NULL, AV_DICT_MATCH_CASE);
int channel_count;
+ if (c->isom)
+ avio_skip(pb, 6); /* reserved */
+ else {
avio_rb16(pb); /* revision level */
id = avio_rl32(pb); /* vendor */
av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0);
+ }
channel_count = avio_rb16(pb);
diff --git a/tests/ref/fate/h264-bsf-redundant-pps-side-data
b/tests/ref/fate/h264-bsf-redundant-pps-side-data
index cecbe1acf9..da27c3fe59 100644
--- a/tests/ref/fate/h264-bsf-redundant-pps-side-data
+++ b/tests/ref/fate/h264-bsf-redundant-pps-side-data
@@ -1,5 +1,5 @@
-92fe70291f72acf94ba56b426bbaccb0
*tests/data/fate/h264-bsf-redundant-pps-side-data.nut
-596100 tests/data/fate/h264-bsf-redundant-pps-side-data.nut
+18c64ec6b4f0cc39c5f8f3564b372fef
*tests/data/fate/h264-bsf-redundant-pps-side-data.nut
+596084 tests/data/fate/h264-bsf-redundant-pps-side-data.nut
#extradata 0: 34, 0x850408e3
#tb 0: 1/48000
#media_type 0: video
diff --git a/tests/ref/fate/h264-bsf-redundant-pps-side-data2
b/tests/ref/fate/h264-bsf-redundant-pps-side-data2
index 2a483144e7..99918b80e4 100644
--- a/tests/ref/fate/h264-bsf-redundant-pps-side-data2
+++ b/tests/ref/fate/h264-bsf-redundant-pps-side-data2
@@ -1,5 +1,5 @@
-dd953f8d95d2927703ce9593a07fe2e7
*tests/data/fate/h264-bsf-redundant-pps-side-data2.nut
-5162 tests/data/fate/h264-bsf-redundant-pps-side-data2.nut
+f94ed2c25b6bbe63160743f08de33665
*tests/data/fate/h264-bsf-redundant-pps-side-data2.nut
+5138 tests/data/fate/h264-bsf-redundant-pps-side-data2.nut
#tb 0: 1/25
#media_type 0: video
#codec_id 0: rawvideo
diff --git a/tests/ref/fate/matroska-alac-remux
b/tests/ref/fate/matroska-alac-remux
index 9b73263acd..1e7a5b4c8e 100644
--- a/tests/ref/fate/matroska-alac-remux
+++ b/tests/ref/fate/matroska-alac-remux
@@ -1,5 +1,5 @@
-90c54a00ad8662c3eb93150791fa8328 *tests/data/fate/matroska-alac-remux.matroska
-1293824 tests/data/fate/matroska-alac-remux.matroska
+6075eb35f53692596194f3b0175cb184 *tests/data/fate/matroska-alac-remux.matroska
+1293794 tests/data/fate/matroska-alac-remux.matroska
#extradata 0: 36, 0x562b05d8
#tb 0: 1/1000
#media_type 0: audio
diff --git a/tests/ref/fate/matroska-dovi-write-config7
b/tests/ref/fate/matroska-dovi-write-config7
index 5f3e000279..edb6757c68 100644
--- a/tests/ref/fate/matroska-dovi-write-config7
+++ b/tests/ref/fate/matroska-dovi-write-config7
@@ -1,5 +1,5 @@
-7adef53df9e14358e0b99f8a829e2d97
*tests/data/fate/matroska-dovi-write-config7.matroska
-72700 tests/data/fate/matroska-dovi-write-config7.matroska
+adafbb4d021db027f4ae4ef7ca1c56c2
*tests/data/fate/matroska-dovi-write-config7.matroska
+72640 tests/data/fate/matroska-dovi-write-config7.matroska
#extradata 0: 116, 0x2b8d1669
#extradata 1: 116, 0x2b8d1669
#tb 0: 1/1000
diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4
b/tests/ref/fate/mov-mp4-iamf-5_1_4
index 18a1f5337f..9eaa5ee42d 100644
--- a/tests/ref/fate/mov-mp4-iamf-5_1_4
+++ b/tests/ref/fate/mov-mp4-iamf-5_1_4
@@ -160,7 +160,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x0
@@ -395,7 +394,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x0
diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first
b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first
index d5a1fe1cad..55cadb3d02 100644
--- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first
+++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first
@@ -207,7 +207,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=1
id=0x2
@@ -465,7 +464,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=1
id=0x2
diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last
b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last
index caf89d41f6..80c924c821 100644
--- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last
+++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last
@@ -207,7 +207,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x9
@@ -465,7 +464,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x9
diff --git a/tests/ref/fate/mov-mp4-iamf-ambisonic_1
b/tests/ref/fate/mov-mp4-iamf-ambisonic_1
index d0877f73c7..b6f14099c3 100644
--- a/tests/ref/fate/mov-mp4-iamf-ambisonic_1
+++ b/tests/ref/fate/mov-mp4-iamf-ambisonic_1
@@ -99,7 +99,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x0
@@ -264,7 +263,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x0
diff --git a/tests/ref/fate/mov-mp4-iamf-stereo
b/tests/ref/fate/mov-mp4-iamf-stereo
index ca8f6a76f5..85e6e3efbb 100644
--- a/tests/ref/fate/mov-mp4-iamf-stereo
+++ b/tests/ref/fate/mov-mp4-iamf-stereo
@@ -52,7 +52,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x0
@@ -187,7 +186,6 @@ DISPOSITION:still_image=0
DISPOSITION:multilayer=0
TAG:language=und
TAG:handler_name=SoundHandler
-TAG:vendor_id=[0][0][0][0]
[STREAM]
index=0
id=0x0
-----------------------------------------------------------------------
Summary of changes:
libavformat/mov.c | 10 ++++++++++
tests/ref/fate/h264-bsf-redundant-pps-side-data | 4 ++--
tests/ref/fate/h264-bsf-redundant-pps-side-data2 | 4 ++--
tests/ref/fate/matroska-alac-remux | 4 ++--
tests/ref/fate/matroska-dovi-write-config7 | 4 ++--
tests/ref/fate/mov-mp4-iamf-5_1_4 | 2 --
tests/ref/fate/mov-mp4-iamf-7_1_4-video-first | 2 --
tests/ref/fate/mov-mp4-iamf-7_1_4-video-last | 2 --
tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 2 --
tests/ref/fate/mov-mp4-iamf-stereo | 2 --
10 files changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
