summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-05-18 03:58:42 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-05-30 19:22:51 (GMT)
commit1cb907e1ba88d3e758f5df899afa5dfbf300a454 (patch)
tree0c2312a345d4ab53bb42ad1ae307a662f2af5dcc
parentf4f59e1959e63d1d81e5acdf608a3a9e9c5f1dfc (diff)
downloadmeta-intel-1cb907e1ba88d3e758f5df899afa5dfbf300a454.tar.gz
ffmpeg: add --enable-yasm
Enable yasm for the ffmpeg build - we don't want a 'crippled build' or lipsync problems. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--common/recipes-multimedia/ffmpeg/ffmpeg.inc2
-rw-r--r--common/recipes-multimedia/ffmpeg/ffmpeg_0.7.12.bb1
2 files changed, 2 insertions, 1 deletions
diff --git a/common/recipes-multimedia/ffmpeg/ffmpeg.inc b/common/recipes-multimedia/ffmpeg/ffmpeg.inc
index aa11ee9..96da7c2 100644
--- a/common/recipes-multimedia/ffmpeg/ffmpeg.inc
+++ b/common/recipes-multimedia/ffmpeg/ffmpeg.inc
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
7 7
8ARM_INSTRUCTION_SET = "arm" 8ARM_INSTRUCTION_SET = "arm"
9 9
10DEPENDS = "zlib libogg libvorbis libtheora liba52 libva" 10DEPENDS = "zlib libogg libvorbis libtheora liba52 libva yasm-native"
11 11
12INC_PR = "r0" 12INC_PR = "r0"
13 13
diff --git a/common/recipes-multimedia/ffmpeg/ffmpeg_0.7.12.bb b/common/recipes-multimedia/ffmpeg/ffmpeg_0.7.12.bb
index 0d316d0..31442cc 100644
--- a/common/recipes-multimedia/ffmpeg/ffmpeg_0.7.12.bb
+++ b/common/recipes-multimedia/ffmpeg/ffmpeg_0.7.12.bb
@@ -27,6 +27,7 @@ EXTRA_OECONF = " \
27 --enable-swscale \ 27 --enable-swscale \
28 --enable-vaapi \ 28 --enable-vaapi \
29 --enable-gpl \ 29 --enable-gpl \
30 --enable-yasm \
30 --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ 31 --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
31 --extra-ldflags="${TARGET_LDFLAGS}" \ 32 --extra-ldflags="${TARGET_LDFLAGS}" \
32 --sysroot="${STAGING_DIR_TARGET}" \ 33 --sysroot="${STAGING_DIR_TARGET}" \