This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 0559f92adc8238df9f1d7dc2a4d48df3b01b09ef
Author:     James Almer <[email protected]>
AuthorDate: Sun Jun 21 02:24:21 2026 +0000
Commit:     James Almer <[email protected]>
CommitDate: Tue Jun 23 20:07:25 2026 -0300

    avformat/movenc: don't derive tmcd track durations if they were copied
    
    This behavior only applies to tracks created by the muxer.
    
    Signed-off-by: James Almer <[email protected]>
---
 libavformat/movenc.c        | 2 +-
 tests/ref/fate/copy-trac236 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 66820b3c7b..5accd27282 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5410,7 +5410,7 @@ static int mov_write_moov_tag(AVIOContext *pb, 
MOVMuxContext *mov,
                 if (ret < 0)
                     return ret;
             }
-            if (track->nb_src_track) {
+            if (mov->nb_meta_tmcd && track->nb_src_track) {
                 /* Derive the duration from the first source track, matching
                  * the convention used by get_pts_range() and the rtp/lvc1
                  * branches above. The source may use a different timescale. */
diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236
index d6b85a2e1a..016492cf23 100644
--- a/tests/ref/fate/copy-trac236
+++ b/tests/ref/fate/copy-trac236
@@ -1,4 +1,4 @@
-9a83123657a10c164268dd832e637bd8 *tests/data/fate/copy-trac236.mov
+1683aff9357630012ded47d7e45d2c8a *tests/data/fate/copy-trac236.mov
 630918 tests/data/fate/copy-trac236.mov
 #tb 0: 100/2997
 #media_type 0: video

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to