Let's not bundle yasm because we never actually did. Use system yasm. I'll update the docs shortly.

This commit is contained in:
Ben "root" Anderson
2015-01-22 21:44:04 -06:00
parent 8ffebb9612
commit d05043f5e6
+1 -1
View File
@@ -73,7 +73,7 @@ dnl System FFMpeg
dnl We might as well throw in GPL stuff as we're bound to GPL by libmad anyway. dnl We might as well throw in GPL stuff as we're bound to GPL by libmad anyway.
FFMPEG_CONFFLAGS="--enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter" FFMPEG_CONFFLAGS="--enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter"
if test "$host_os" = "mingw32"; then if test "$host_os" = "mingw32"; then
FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --yasmexe=../yasm-1.2.0-win32.exe --arch=x86" FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --arch=x86"
fi fi
if test "$enable_lto" = "yes"; then if test "$enable_lto" = "yes"; then
FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --enable-lto" FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --enable-lto"