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

ffmpeg: Update to ffmpeg 3.0.1 and Kodi upstream #77

Merged
merged 2 commits into from
Apr 18, 2016
Merged

ffmpeg: Update to ffmpeg 3.0.1 and Kodi upstream #77

merged 2 commits into from
Apr 18, 2016

Conversation

MilhouseVH
Copy link
Contributor

!!KODI 17!!

Major ffmpeg version change.

Switch to Kodi as upstream, allowing us to drop Kodi-specific patches.

Drops dcadec, which is now included in ffmpeg 3.0.

Adds popcornmix HEVC optimisations and bug fixes (previously RPi2 specific in Kodi 16).

@MilhouseVH MilhouseVH changed the title Ffmpeg3 ffmpeg: Update to ffmpeg 3.0.1 and Kodi upstream Apr 1, 2016
@the-dreamer
Copy link

this PR is not compatible with PR98:

building kodi fails:
checking for vorbis/vorbisfile.h... yes
checking for LIBDCADEC... no
configure: error: libdcadec not found

not sure if PR98 contains a to old Kodi rev. (from 29 march.)

@MilhouseVH
Copy link
Contributor Author

not sure if PR98 contains a to old Kodi rev. (from 29 march.)

That probably it, I've been building with top of tree Kodi master without any issues (PR98 + PR77, bump to latest kodi master => builds).

No time to look into this today, but if it's not fixed overnight I'll try and confirm it tomorrow.

@mhueske
Copy link
Contributor

mhueske commented Apr 15, 2016

On imx this works like Milhouse said. PR98 + PR77 + latest kodi master builds (after removing jarvis/imx specific patches). Not yet runtime tesed...

@lrusak
Copy link
Member

lrusak commented Apr 17, 2016

Anything else needed here? This is ready to merge after #98 ?

@MilhouseVH
Copy link
Contributor Author

This is ready to merge after #98 ?

I think so, yes.

@the-dreamer
Copy link

no error regarding this PR after updated PR #98

@MilhouseVH MilhouseVH merged commit 703e4a0 into LibreELEC:master Apr 18, 2016
@MilhouseVH MilhouseVH deleted the ffmpeg3 branch May 6, 2016 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants