avformat/movenc: ensure we don't write the major brand as a compatible brand more than once

Signed-off-by: James Almer <jamrial@gmail.com>

8 files changed, 42 insertions, 42 deletions

diff --git a/tests/ref/fate/adtstoasc_ticket3715 b/tests/ref/fate/adtstoasc_ticket3715
index 657898e1b4..49fa3eb8d9 100644
--- a/tests/ref/fate/adtstoasc_ticket3715
+++ b/tests/ref/fate/adtstoasc_ticket3715
@@ -1,5 +1,5 @@
-cdb20dd801cd2458ef14d3bdfbb2fe14 *tests/data/fate/adtstoasc_ticket3715.mov
-33332 tests/data/fate/adtstoasc_ticket3715.mov
+4110be924e21846d0e174fac679b062e *tests/data/fate/adtstoasc_ticket3715.mov
+33324 tests/data/fate/adtstoasc_ticket3715.mov
 #extradata 0:        2, 0x00340022
 #tb 0: 1/44100
 #media_type 0: audio
diff --git a/tests/ref/fate/binsub-movtextenc b/tests/ref/fate/binsub-movtextenc
index f98dab703e..78c05f4376 100644
--- a/tests/ref/fate/binsub-movtextenc
+++ b/tests/ref/fate/binsub-movtextenc
@@ -1 +1 @@
-259cc7794d438acff479eff693a72d06
+35adf776cd73e808186ae7124445f4b8
diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236
index bab8865093..1583ae5704 100644
--- a/tests/ref/fate/copy-trac236
+++ b/tests/ref/fate/copy-trac236
@@ -1,5 +1,5 @@
-69f8fe93505811e703936d3144a71dbe *tests/data/fate/copy-trac236.mov
-630868 tests/data/fate/copy-trac236.mov
+984a33c6292e3d35e2cfdfbf66d8e82b *tests/data/fate/copy-trac236.mov
+630860 tests/data/fate/copy-trac236.mov
 #tb 0: 100/2997
 #media_type 0: video
 #codec_id 0: rawvideo
diff --git a/tests/ref/fate/copy-trac3074 b/tests/ref/fate/copy-trac3074
index c6ffda5487..ff66900253 100644
--- a/tests/ref/fate/copy-trac3074
+++ b/tests/ref/fate/copy-trac3074
@@ -1,5 +1,5 @@
-15c0e65a78c9f6646b2ca13cfe475d35 *tests/data/fate/copy-trac3074.mp4
-333996 tests/data/fate/copy-trac3074.mp4
+f92a201033712bda262f1e071e25544a *tests/data/fate/copy-trac3074.mp4
+333992 tests/data/fate/copy-trac3074.mp4
 #tb 0: 1/48000
 #media_type 0: audio
 #codec_id 0: eac3
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
index 5ba9acbe2f..eacb1f1910 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
@@ -10,7 +10,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=4612
-pos=44
+pos=36
 flags=K_
 data_hash=adler32:ed83c166
 [/PACKET]
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
index b85e9d06f1..ff96888f41 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
@@ -10,7 +10,7 @@ duration_time=0.040000
 convergence_duration=N/A
 convergence_duration_time=N/A
 size=9220
-pos=44
+pos=36
 flags=K_
 data_hash=adler32:b3ccc147
 [/PACKET]
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index 65ad921c80..68ce3f6cd9 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -1,18 +1,18 @@
-write_data len 40, time nopts, type header atom ftyp
+write_data len 36, time nopts, type header atom ftyp
 write_data len 2389, time nopts, type header atom -
 write_data len 788, time 1000000, type sync atom moof
 write_data len 110, time nopts, type trailer atom -
-8243f1d6c158774341c314e823ccc6da 3327 non-empty-moov
-write_data len 40, time nopts, type header atom ftyp
+66cf48604f039aa9a51711786f5c8778 3323 non-empty-moov
+write_data len 36, time nopts, type header atom ftyp
 write_data len 2721, time nopts, type header atom -
 write_data len 908, time 966667, type sync atom moof
 write_data len 110, time nopts, type trailer atom -
-312cfc1e6b04df742011fdbe08aace93 3779 non-empty-moov-elst
-write_data len 40, time nopts, type header atom ftyp
+04b2e86f455af94f9258b8d66dbf71f5 3775 non-empty-moov-elst
+write_data len 36, time nopts, type header atom ftyp
 write_data len 2629, time nopts, type header atom -
 write_data len 908, time 1000000, type sync atom moof
 write_data len 110, time nopts, type trailer atom -
-82db45522bd9e4ac897cc7903a787adb 3687 non-empty-moov-no-elst
+e9f6fa032d6d8265d67aef5de81a48bf 3683 non-empty-moov-no-elst
 write_data len 24, time nopts, type header atom ftyp
 write_data len 1171, time nopts, type header atom -
 write_data len 728, time 0, type sync atom moof
@@ -21,55 +21,55 @@ write_data len 728, time 1046439, type sync atom moof
 write_data len 812, time nopts, type unknown atom -
 write_data len 148, time nopts, type trailer atom -
 a7c93f998e88fee1159580b6ca7e3d2b 4439 ismv
-write_data len 40, time nopts, type header atom ftyp
+write_data len 36, time nopts, type header atom ftyp
 write_data len 1123, time nopts, type header atom -
 write_data len 796, time 0, type sync atom moof
 write_data len 788, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-4bfb3a87b205515b6c9774c00b2acef6 2895 empty-moov
-write_data len 40, time nopts, type header atom ftyp
+e6a4b15443d006efd727a80f6624b7db 2891 empty-moov
+write_data len 36, time nopts, type header atom ftyp
 write_data len 1123, time nopts, type header atom -
 write_data len 1068, time 0, type sync atom moof
 write_data len 908, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-cfe8c3625ccd01c05cea23165e784eae 3287 empty-moov-no-elst
-write_data len 40, time nopts, type header atom ftyp
+800f854aff2ac76dfaddebd0562c75b9 3283 empty-moov-no-elst
+write_data len 36, time nopts, type header atom ftyp
 write_data len 1123, time nopts, type header atom -
 write_data len 900, time -33333, type sync atom moof
 write_data len 908, time 966667, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-08dc75b3355921541aa41642a0308423 3119 empty-moov-no-elst-no-adjust
-write_data len 1163, time nopts, type header atom ftyp
+eca1a945c9063dab0858af6b85925533 3115 empty-moov-no-elst-no-adjust
+write_data len 1159, time nopts, type header atom ftyp
 write_data len 796, time 0, type sync atom moof
 write_data len 788, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-4bfb3a87b205515b6c9774c00b2acef6 2895 delay-moov
-write_data len 1235, time nopts, type header atom ftyp
+e6a4b15443d006efd727a80f6624b7db 2891 delay-moov
+write_data len 1231, time nopts, type header atom ftyp
 write_data len 916, time -33333, type sync atom moof
 write_data len 908, time 966667, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-cda02de9fb30275161e92fb64077db64 3207 delay-moov-elst
-write_data len 1199, time nopts, type header atom ftyp
+c2ecdbc80668fcee73f5a039e2dba579 3203 delay-moov-elst
+write_data len 1195, time nopts, type header atom ftyp
 write_data len 836, time 0, type sync atom moof
 write_data len 67, time nopts, type trailer atom -
-299920e7c17047d5959facf281578d53 2102 delay-moov-empty-track
-write_data len 1199, time nopts, type header atom ftyp
+95d6f59a7354b0cfe7ce49927baada4e 2098 delay-moov-empty-track
+write_data len 1195, time nopts, type header atom ftyp
 write_data len 360, time 0, type sync atom moof
 write_data len 360, time 1000000, type sync atom moof
 write_data len 86, time nopts, type trailer atom -
-f59b3dfa047519167f69dc61b1fd2f30 2005 delay-moov-empty-track-flush
-write_data len 40, time nopts, type header atom ftyp
+8805d72a27b340ea229c16edde78f974 2001 delay-moov-empty-track-flush
+write_data len 36, time nopts, type header atom ftyp
 write_data len 1123, time nopts, type header atom -
-0954dede2090f563fcf6a8141f2b67ec 1163 empty-moov-header
+351ae2c8b6d35d98b4848c309cce6704 1159 empty-moov-header
 write_data len 796, time 0, type sync atom moof
 write_data len 788, time 1000000, type sync atom moof
-f233dae46d68bf452a760de6ece9eca0 1584 empty-moov-content
+a0165f4a26a409212b0946e981bdefb9 1584 empty-moov-content
 write_data len 148, time nopts, type trailer atom -
-write_data len 1163, time nopts, type header atom ftyp
-0954dede2090f563fcf6a8141f2b67ec 1163 delay-moov-header
+write_data len 1159, time nopts, type header atom ftyp
+351ae2c8b6d35d98b4848c309cce6704 1159 delay-moov-header
 write_data len 796, time 0, type sync atom moof
 write_data len 788, time 1000000, type sync atom moof
-f233dae46d68bf452a760de6ece9eca0 1584 delay-moov-content
+a0165f4a26a409212b0946e981bdefb9 1584 delay-moov-content
 write_data len 148, time nopts, type trailer atom -
 write_data len 28, time nopts, type header atom -
 write_data len 1123, time nopts, type header atom -
@@ -123,7 +123,7 @@ write_data len 2572, time -333333, type sync atom sidx
 write_data len 996, time 5166667, type sync atom sidx
 write_data len 148, time nopts, type trailer atom -
 c3eb39921c90724784d1ab84fac58b34 4939 vfr-noduration
-write_data len 1235, time nopts, type header atom ftyp
+write_data len 1231, time nopts, type header atom ftyp
 write_data len 1500, time -333333, type sync atom moof
 write_data len 1500, time nopts, type unknown atom -
 write_data len 916, time nopts, type unknown atom -
@@ -131,23 +131,23 @@ write_data len 1500, time 9666667, type sync atom moof
 write_data len 1500, time nopts, type unknown atom -
 write_data len 1004, time nopts, type unknown atom -
 write_data len 148, time nopts, type trailer atom -
-18955d03e6095f4edd38023320a101b6 9303 large_frag
-write_data len 1235, time nopts, type header atom ftyp
+5bde1358e246e715b2096daa321c9f1b 9299 large_frag
+write_data len 1231, time nopts, type header atom ftyp
 write_data len 684, time -33333, type sync atom moof
 write_data len 504, time 800000, type boundary atom moof
 write_data len 420, time 1266667, type boundary atom moof
 write_data len 668, time 1566667, type sync atom moof
 write_data len 440, time 2233333, type boundary atom moof
 write_data len 262, time nopts, type trailer atom -
-6be0707df5a18d56404a6d7b750cb8ee 4213 vfr-noduration-interleave
+47cc2460c4b18390c67991cf3251409b 4209 vfr-noduration-interleave
 write_data len 1235, time nopts, type header atom ftyp
 write_data len 916, time 0, type sync atom moof
 write_data len 908, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-8175f4ba3f1a210465531879356e0222 3207 delay-moov-elst-neg-cts
+c272739705fb78f9d9bffd4c6376c8ce 3207 delay-moov-elst-neg-cts
 write_data len 40, time nopts, type header atom ftyp
 write_data len 1123, time nopts, type header atom -
 write_data len 1188, time 0, type sync atom moof
 write_data len 908, time 1033333, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-32a0512e2e5dd46cd7646f25d0e4c55a 3407 empty-moov-neg-cts
+26c05cd931471319def6f3d5257a6a7a 3407 empty-moov-neg-cts
diff --git a/tests/ref/fate/prores-metadata b/tests/ref/fate/prores-metadata
index ab71f8d082..56153c3946 100644
--- a/tests/ref/fate/prores-metadata
+++ b/tests/ref/fate/prores-metadata
@@ -1 +1 @@
-bd429065eed6a374b01e067ef36f6b0b
+3492734b4bd0dd097cd9f264457c8345