Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for AVC in HEIF mime types (backport #3085) #3086

Merged
merged 1 commit into from
Dec 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2024

@mergify mergify bot added the conflicts label Dec 7, 2024
Copy link
Contributor Author

mergify bot commented Dec 7, 2024

Cherry-pick of 1f97a0a has failed:

On branch mergify/bp/0.28.x/pr-3085
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 1f97a0a7e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/bmffimage.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos added enhancement feature / functionality enhancements imageHandler Anything related to specific ImageHandlers labels Dec 7, 2024
@kmilos kmilos added this to the v0.28.4 milestone Dec 7, 2024
(cherry picked from commit 1f97a0a)

# Conflicts:
#	src/bmffimage.cpp
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-3085 branch from 896b73b to f95055e Compare December 7, 2024 16:37
@kmilos kmilos removed the conflicts label Dec 7, 2024
@kmilos kmilos merged commit 9c8aa83 into 0.28.x Dec 7, 2024
61 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3085 branch December 7, 2024 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement feature / functionality enhancements imageHandler Anything related to specific ImageHandlers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant