Skip to content

ffmpeg 6.1.5#31

Open
UTsweetyfish wants to merge 4 commits into
masterfrom
ffmpeg-6.1.5
Open

ffmpeg 6.1.5#31
UTsweetyfish wants to merge 4 commits into
masterfrom
ffmpeg-6.1.5

Conversation

@UTsweetyfish
Copy link
Copy Markdown
Contributor

  • Import upstream version 6.1.5
  • gbp pq rebase:
  • Drop 3 patches
  • Release ffmpeg 6.1.5-0deepin1

* d/p/0002-avcodec-tests-rename-the-bundled-Mesa-AV1-vulkan-vid.patch: dropping c7c6d4c1396508c30cce4f019f64ddd0981490d1 {avcodec,tests}: rename the bundled Mesa AV1 vulkan video headers -- patch contents already upstream
* d/p/0004-avcodec-jpeg2000dec-cve-2025-9951.patch: dropping a9c8bad53707d723acbd14709a6dec1f9024311b avcodec-jpeg2000dec-cve-2025-9951 -- patch contents already upstream
* d/p/0005-libavfilter-asrc_afirsrc-cve-2023-49501.patch: dropping 7525c00f0823e33cbbb636058779a6d724da8c52 libavfilter-asrc_afirsrc-cve-2023-49501 -- patch contents already upstream
* d/p/0007-fftools-ffmpeg_mux_init-cve-2024-35365.patch: CONFLICT (content): Merge conflict in fftools/ffmpeg_mux_init.c, dropped
@github-actions
Copy link
Copy Markdown

TAG Bot

TAG: 7%6.1.5-0deepin1
EXISTED: no
DISTRIBUTION: unstable

@UTsweetyfish
Copy link
Copy Markdown
Contributor Author

/integrate

@deepin-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from utsweetyfish. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot
Copy link
Copy Markdown
Contributor

/hold
因为该quilt包的上游版本号变更,详情见: deepin-community/infra-settings#134

@github-actions
Copy link
Copy Markdown

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#4022
PrNumber: 4022
PrBranch: auto-integration-25897051840

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants