This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 986faf44eaa3c83c483a69654565489c48bd9719 Author: Tom Needham <[email protected]> AuthorDate: Fri Sep 11 18:58:07 2026 +0000 Commit: Tom Needham <[email protected]> CommitDate: Sun Oct 18 20:57:53 2026 +0000 libavformat/demux: Don't treat IMM6 as one_in one_out Exclude IMM6 from one-in/one-out timestamp inference so AVI probing does not assign PTS from DTS before the H.264 reordering delay is known. Signed-off-by: Tom Needham <[email protected]> --- libavformat/demux.c | 3 ++- tests/ref/fate/imm6 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index cfab580fb6..06c4331807 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1015,7 +1015,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, AVRational duration; int onein_oneout = st->codecpar->codec_id != AV_CODEC_ID_H264 && st->codecpar->codec_id != AV_CODEC_ID_HEVC && - st->codecpar->codec_id != AV_CODEC_ID_VVC; + st->codecpar->codec_id != AV_CODEC_ID_VVC && + st->codecpar->codec_id != AV_CODEC_ID_IMM6; if (s->flags & AVFMT_FLAG_NOFILLIN) return; diff --git a/tests/ref/fate/imm6 b/tests/ref/fate/imm6 index 2ef212940f..a8c6117766 100644 --- a/tests/ref/fate/imm6 +++ b/tests/ref/fate/imm6 @@ -3,7 +3,7 @@ #codec_id 0: rawvideo #dimensions 0: 1280x720 #sar 0: 81/256 -0, 0, 0, 1, 2764800, 0xe57aa7a6 +0, 2, 2, 1, 2764800, 0xe57aa7a6 0, 3, 3, 1, 2764800, 0x57504f30 0, 4, 4, 1, 2764800, 0x068318f9 0, 5, 5, 1, 2764800, 0x6d4ae138 -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
