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 3.2.6, correct arm optimization check #4555

Merged
merged 1 commit into from
Jul 13, 2017

Conversation

antonlacon
Copy link
Contributor

Maintainer: me & @thess
Compile tested: mvebu/wrt3200acm, imx6/generic, LEDE trunk
Run tested: none

Description:
Minor version bump of ffmpeg to 3.2.6 and correct issue #4506

The arm optimization check is changed to be roughly:

if vfp found in target optimizations, then enable vfp, otherwise disable vfp.
then check if neon is in target optimizations and enable vfp & neon, otherwise disable neon.

As ffmpeg takes the "most recent" enable/disable command as the one to use, enabling vfp with neon effectively bypasses the earlier vfp check disabling it when not found. I don't have the hardware to test deployment, but ./configure does what I expect it to on the vfp-only and neon+vfp boards compiled for above.

mpfu=neon implies neon-vfpv3, so enable vfp when just neon is found.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
@diizzyy
Copy link
Contributor

diizzyy commented Jul 7, 2017

Thanks, is there a reason why we're not using the 3.3 branch?

@antonlacon
Copy link
Contributor Author

No special reason not to use 3.3. It hasn't been a priority for me.

@diizzyy
Copy link
Contributor

diizzyy commented Jul 12, 2017

@hnyman
Ok to merge?

@hnyman
Copy link
Contributor

hnyman commented Jul 13, 2017

@antonlacon
please drop the deprecated PKG_MD5SUM next time, as you already have PKG_HASH there. No need to have both.

@hnyman hnyman merged commit 4abda06 into openwrt:master Jul 13, 2017
jp-bennett pushed a commit to jp-bennett/packages that referenced this pull request Jul 29, 2017
Update mpg123 to 1.25.2
Change download URL to Sourceforge
Change deprecated checksum variable (PKG_MD5SUM) to PKG_HASH
Add libout123
Add generic optimizations depending on platform have fpu or not
Add NEON-specific optimization
Remove BUILD_PATENTED, reference:
openwrt#4587
Small cleanup of Makefile
Thanks to Ted Hess for reviewing and suggesting compilation fix

NOTE:
mpg123 uses the most recent approach just like ffmpeg that's
mentioned here: openwrt#4555

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
mkrkn pushed a commit to mkrkn/packages that referenced this pull request Aug 23, 2017
Update mpg123 to 1.25.2
Change download URL to Sourceforge
Change deprecated checksum variable (PKG_MD5SUM) to PKG_HASH
Add libout123
Add generic optimizations depending on platform have fpu or not
Add NEON-specific optimization
Remove BUILD_PATENTED, reference:
openwrt#4587
Small cleanup of Makefile
Thanks to Ted Hess for reviewing and suggesting compilation fix

NOTE:
mpg123 uses the most recent approach just like ffmpeg that's
mentioned here: openwrt#4555

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
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

3 participants