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

jpeg: add encodingProcess and numColorComponents SOF members (backport #2874) #2887

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

This is an automatic backport of pull request #2874 done by Mergify.
Cherry-pick of 6b5cb98 has failed:

On branch mergify/bp/0.28.x/pr-2874
Your branch is ahead of 'origin/0.28.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6b5cb9841.
  (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)

Changes to be committed:
	new file:   samples/jpegparsetest.cpp
	new file:   tests/bash_tests/test_jpegparse.py
	modified:   tests/suite.conf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   samples/CMakeLists.txt

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

enen92 added 3 commits January 8, 2024 23:23
(cherry picked from commit 6b5cb98)

# Conflicts:
#	samples/CMakeLists.txt
(cherry picked from commit d3539ca)
@ghost
Copy link

ghost commented Jan 8, 2024

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

@neheb neheb closed this Jan 11, 2024
@neheb neheb deleted the mergify/bp/0.28.x/pr-2874 branch January 11, 2024 23:13
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