The branch, master has been updated
via 68152978b522c0a24a3e4d26af2a5fbeffb22e24 (commit)
from 8c633f45b04a27ba297af17ea7f62dab1f35cd6c (commit)
- Log -----------------------------------------------------------------
commit 68152978b522c0a24a3e4d26af2a5fbeffb22e24
Author: Anthony Bajoua <[email protected]>
AuthorDate: Sat Oct 25 02:10:06 2025 -0700
Commit: Martin Storsjö <[email protected]>
CommitDate: Mon Oct 27 09:06:06 2025 +0000
libavformat/movenc: Output ftyp atom with hybrid_fragmented+delay_moov
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index eabc1b95ca..e949c54f04 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -6536,7 +6536,8 @@ static int mov_flush_fragment(AVFormatContext *s, int
force)
mov->tracks[i].data_offset = pos + moov_size + 8;
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);
- if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
+ if (mov->flags & FF_MOV_FLAG_DELAY_MOOV &&
+ !(mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED))
mov_write_identification(s->pb, s);
if ((ret = mov_write_moov_tag(s->pb, mov, s)) < 0)
return ret;
@@ -8413,7 +8414,8 @@ static int mov_write_header(AVFormatContext *s)
}
}
- if (!(mov->flags & FF_MOV_FLAG_DELAY_MOOV)) {
+ if (!(mov->flags & FF_MOV_FLAG_DELAY_MOOV) ||
+ (mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED)) {
if ((ret = mov_write_identification(pb, s)) < 0)
return ret;
}
-----------------------------------------------------------------------
Summary of changes:
libavformat/movenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
