allow concatenation of tracks with different decoder configs in -cat …

…- see #549
gpac · Apr 3, 2024 · ea708a0 · ea708a0
1 parent 3ea179c
commit ea708a0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/applications/mp4box/fileimport.c b/applications/mp4box/fileimport.c
@@ -2879,6 +2879,8 @@ GF_Err cat_isomedia_file(GF_ISOFile *dest, char *fileName, u32 import_flags, GF_
 			if (gf_isom_get_sample_description_count(orig, i+1) != gf_isom_get_sample_description_count(dest, dst_tk)) dst_tk = 0;
 			/*if not forcing cat, check the media codec config is the same*/
 			if (!gf_isom_is_same_sample_description(orig, i+1, 0, dest, dst_tk, 0)) {
+				//we will need to merge the same descriptions
+				if (!force_cat) dst_tk_sample_entry = dst_tk;
 				dst_tk = 0;
 			}
 			/*we force the same visual resolution*/