From: Zhao Zhili <zhiliz...@tencent.com>
---
libavformat/movenc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index cd5b45f6fe..93af0723db 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -7781,6 +7781,11 @@ static int mov_init(AVFormatContext *s)
!(mov->flags & FF_MOV_FLAG_NEGATIVE_CTS_OFFSETS))
s->avoid_negative_ts = AVFMT_AVOID_NEG_TS_MAKE_ZERO;
+ if (mov->use_editlist && mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) {
+ av_log(s, AV_LOG_ERROR, "Setting both hybrid_fragmented and
use_editlist is not supported.\n");
+ return AVERROR(EINVAL);
+ }
+
/* Clear the omit_tfhd_offset flag if default_base_moof is set;
* if the latter is set that's enough and omit_tfhd_offset doesn't
* add anything extra on top of that. */
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
