Mercurial > mxe-octave

diff src/ffmpeg.mk @ 4029:c4a341e3e014

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ffmpeg: updates to work in windows * src/ffmpeg.mk: add --extra-libs='-mconsole' * src/libvpx.mk: set as to yasm * src/x264-1-fix-bin-bash.patch: update vpx patch from mxe.cc * src/x264.mk: update version,checksum for 20141130-2245 * src/xvidcore.mk: dont rename xvidcore.dll to libxvidecore.dll
author John Donoghue
date Fri, 18 Sep 2015 08:05:55 -0400
parents 28fa86d2cf21
children 66b5ee0963d7
line wrap: on
line diff
--- a/src/ffmpeg.mk	Wed Sep 16 07:51:27 2015 -0400
+++ b/src/ffmpeg.mk	Fri Sep 18 08:05:55 2015 -0400
@@ -29,13 +29,13 @@
         --arch=$(firstword $(subst -, ,$(TARGET))) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
+        --extra-libs='-mconsole' \
         --disable-debug \
         --disable-doc \
         --enable-memalign-hack \
         --enable-gpl \
         --enable-version3 \
         --disable-nonfree \
-        --enable-postproc \
         --disable-pthreads \
         --enable-w32threads \
         --enable-avisynth \
@@ -44,7 +44,6 @@
         --enable-libvorbis \
         --enable-libmp3lame \
         --enable-libxvid \
-        --disable-libfaac \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
         --enable-libx264 \