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

kodi: mid-May 2018 #2680

Merged
merged 13 commits into from Jun 2, 2018
Merged

kodi: mid-May 2018 #2680

merged 13 commits into from Jun 2, 2018

Conversation

MilhouseVH
Copy link
Contributor

No description provided.

@MilhouseVH
Copy link
Contributor Author

ffmpeg: cleanup configure addresses the following:

WARNING: Option --disable-decoder=mpeg_xvmc did not match anything
WARNING: The --enable-yasm option is only provided for compatibility and will be
 removed in the future. Use --enable-x86asm / --disable-x86asm instead.

@@ -81,6 +81,12 @@ else
FFMPEG_FPU="--disable-neon"
fi

if [ "$TARGET_ARCH" = "x86_64" ]; then
FFMPEG_X86ASM="--enable-x86asm"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--enable-x86asmexe=yasm or update depends to nasm?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it looks like nasm became the default (instead of yasm) in ffmpeg-3.4. ffmpeg will now use nasm if it's installed in the build host, otherwise when nasm isn't available it will use yasm (as it will find yasm in the toolchain). I'll push another commit that changes the default back to yasm - many thanks.

@MilhouseVH
Copy link
Contributor Author

I've removed the WIP label, if anyone wants this.

@CvH CvH merged commit 280a674 into LibreELEC:master Jun 2, 2018
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.

None yet

3 participants