]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commit
package/x264: disable optional ffmpeg support
authorBernd Kuhls <bernd.kuhls@t-online.de>
Mon, 5 Jun 2017 16:22:37 +0000 (18:22 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 26 Jun 2017 07:56:14 +0000 (09:56 +0200)
commite0d637c5a957947969d5f7755d69db3d4299b9b2
treea53737d361c44c85a85483a5783dcc8316577322
parent354c0beb99d9a66b8ac318e864230c93e9289179
package/x264: disable optional ffmpeg support

In buildroot ffmpeg uses x264 as optional dependency if
BR2_PACKAGE_FFMPEG_GPL is enabled at the same time.

If BR2_PACKAGE_FFMPEG_GPL is disabled and ffmpeg is built without x264
support before x264 itself is build, x264 picks up certain ffmpeg libs
as optional dependency leading to build errors because x264 does not
correctly link statically against ffmpeg.

To avoid a circular dependency and to avoid teaching x264 how to
correctly link statically with ffmpeg we just disable all ffmpeg-
related options.

Fixes
http://autobuild.buildroot.net/results/36a/36abb5b8f3aab57fb7b63056b216b4a58143ee3e/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit 310e4f07f8cdb3e3272aaed236142d58cfaa44e6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/x264/x264.mk