Skip to content

[pull] master from FFmpeg:master#1815

Merged
pull[bot] merged 2 commits intoQSLee-Net:masterfrom
FFmpeg:master
Oct 16, 2025
Merged

[pull] master from FFmpeg:master#1815
pull[bot] merged 2 commits intoQSLee-Net:masterfrom
FFmpeg:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Oct 16, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

sidx_pts is already in presentation time, so it shouldn't be shift
by sc->time_offset again.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
…fter editlist"

This reverts commit 301141b.

cluster[0].dts, pts and frag_info[0].time are already in presentation
timeline, so they shouldn't be shift by start_pts.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
@pull pull bot locked and limited conversation to collaborators Oct 16, 2025
@pull pull bot added the ⤵️ pull label Oct 16, 2025
@pull pull bot merged commit cd4b017 into QSLee-Net:master Oct 16, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant