diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2015-06-20 21:44:55 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-05 14:43:16 +0200 |
| commit | bfb8df2ad9b164b421d25294c6882c8b61dc59a5 (patch) | |
| tree | 55859815741794cf0b801a3db9176c3ea8042577 | |
| parent | 7314eaa01709b148214994e7e15cd870b41f8d16 (diff) | |
| download | buildroot-bfb8df2ad9b164b421d25294c6882c8b61dc59a5.tar.gz buildroot-bfb8df2ad9b164b421d25294c6882c8b61dc59a5.zip | |
package/ffmpeg: Fix i586 compilation with gcc5
In file included from libavcodec/cabac_functions.h:46:0,
from libavcodec/h264_cabac.c:37:
libavcodec/h264_cabac.c: In function 'ff_h264_decode_mb_cabac':
libavcodec/x86/cabac.h:192:5: error: 'asm' operand has impossible constraints
__asm__ volatile(
To reproduce the bug use this defconfig:
BR2_GCC_VERSION_5_1_X=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_FFMPEG_GPL=y
BR2_PACKAGE_FFMPEG_NONFREE=y
BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_FFMPEG_FFSERVER=y
BR2_PACKAGE_FFMPEG_FFPROBE=y
BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
BR2_PACKAGE_FFMPEG_POSTPROC=y
[Thomas: add a comment in the code.]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 787dbb1884..94aec4b74f 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -261,6 +261,11 @@ ifeq ($(BR2_X86_CPU_HAS_MMX),y) FFMPEG_CONF_OPTS += --enable-yasm FFMPEG_DEPENDENCIES += host-yasm else +ifeq ($(BR2_x86_i586),y) +# Needed to work around a bug with gcc 5.x: +# error: 'asm' operand has impossible constraints +FFMPEG_CONF_OPTS += --disable-inline-asm +endif FFMPEG_CONF_OPTS += --disable-yasm FFMPEG_CONF_OPTS += --disable-mmx endif |
