From ea708a049f3348d988a70a10f83a56aee6123bb3 Mon Sep 17 00:00:00 2001 From: jeanlf Date: Wed, 3 Apr 2024 12:48:31 +0200 Subject: [PATCH] allow concatenation of tracks with different decoder configs in -cat - see #549 --- applications/mp4box/fileimport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/mp4box/fileimport.c b/applications/mp4box/fileimport.c index bbb3344e3e..afde69326b 100644 --- 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*/