summaryrefslogtreecommitdiffstats
path: root/src/ffmpeg.mk
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2012-04-12 15:23:12 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2012-04-12 15:23:12 (GMT)
commit1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch)
tree3116df65f83174295af8c6315a36583f460fe9e0 /src/ffmpeg.mk
parent0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff)
parente513258770cdc39c0d6a904437f191aa61b3175c (diff)
downloadmxe-2.22.zip
mxe-2.22.tar.gz
mxe-2.22.tar.bz2
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/ffmpeg.mk')
-rw-r--r--src/ffmpeg.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 689edc3..6bb5857 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -1,14 +1,11 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
+# This file is part of MXE.
+# See index.html for further information.
-# ffmpeg
PKG := ffmpeg
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.7-rc1
-$(PKG)_CHECKSUM := d15c005f46483fbfc3b678cb1c89123762b56b82
+$(PKG)_CHECKSUM := 743f44a71f93b14c9b26ca2424b0da8457cef4be
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE := http://www.ffmpeg.org/
$(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
$(PKG)_URL_2 := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
$(PKG)_DEPS := gcc bzip2 lame libvpx opencore-amr sdl speex theora vorbis x264 xvidcore zlib
@@ -36,6 +33,7 @@ define $(PKG)_BUILD
--enable-postproc \
--disable-pthreads \
--enable-w32threads \
+ --enable-avisynth \
--enable-libspeex \
--enable-libtheora \
--enable-libvorbis \