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

[cmake] pass vaapi and vdpau options to internal ffmpeg #14017

Merged
merged 2 commits into from
Jun 15, 2018

Conversation

wsnipex
Copy link
Member

@wsnipex wsnipex commented Jun 11, 2018

When building non-depends with internal ffmpeg we currently hardcode ffmpeg options.
This PR allows to at least disable vaapi and vdpau in ffmpeg.

Description

Motivation and Context

building with internal ffmpeg fails when vaapi or vdpau is disabled and the needed libs are missing, or ffmpeg still builds with support for both hw accels.

How Has This Been Tested?

quick build test on linux.
I'm a little bit wary about the reordering of dependency checking, so this needs some testing

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed

@wsnipex wsnipex added Type: Fix non-breaking change which fixes an issue Platform: Linux CMake v18 Leia labels Jun 11, 2018
@Rechi
Copy link
Member

Rechi commented Jun 11, 2018

The ccache workaround can now be removed too.

@wsnipex
Copy link
Member Author

wsnipex commented Jun 11, 2018

removed the ccache workaround.
I'm thinking that it sometimes might be useful to directly pass ffmpeg options (e.g. to build the ffmpeg binary or various optimizations) as well. Wouldn't be difficult to add here. Opinions?

@wsnipex
Copy link
Member Author

wsnipex commented Jun 15, 2018

jenkins build this please

@wsnipex wsnipex merged commit d7a7d99 into xbmc:master Jun 15, 2018
@Rechi Rechi added this to the Leia 18.0-alpha2 milestone Jun 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Platform: Linux Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants