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 the new ffmpeg api #805

Closed
wants to merge 2 commits into from
Closed

Add support for the new ffmpeg api #805

wants to merge 2 commits into from

Conversation

scarabeusiv
Copy link

Hi,
if one builds xbmc with too-new external ffmpeg it fails due to missing new include.

This can be solved by checking for the include in the configure and then just including it when found.

See the attached commit for the fix.

It would be nice to have this also merged to eden branch.

Cheers

Tom

Tomas Chvatal added 2 commits March 23, 2012 11:59
The libav use micro version as 0
The ffmpeg use the micro version as 100+

Simply check if the variable is defined then it is not libav.
@Montellese
Copy link
Member

You can't create two pull requests from the same branch which is why your second commit (libav related meant for #806) appears in this pull request as well. In the future you should create a new branch for every pull request you want to submit and then do your work in those feature-specific branches and send the pull requests from those branches.

@scarabeusiv
Copy link
Author

Thanks for explanation, this is first time I created some multiple pull requests at once. Should I redo it so it contain only the first commit or you can pick only the first one somehow?

@scarabeusiv
Copy link
Author

Closing this pull requested as I replaced it by 809 where I created the branch which contain only the relevant patch.

tru pushed a commit to plexinc/plex-home-theater-public that referenced this pull request Nov 12, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants