ekiga r6133 - in trunk: . win32
- From: mschneid svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6133 - in trunk: . win32
- Date: Sun, 6 Apr 2008 18:53:49 +0100 (BST)
Author: mschneid
Date: Sun Apr 6 18:53:49 2008
New Revision: 6133
URL: http://svn.gnome.org/viewvc/ekiga?rev=6133&view=rev
Log:
Fix ffmpeg in win32 build.
Modified:
trunk/ChangeLog
trunk/win32/Makefile
Modified: trunk/win32/Makefile
==============================================================================
--- trunk/win32/Makefile (original)
+++ trunk/win32/Makefile Sun Apr 6 18:53:49 2008
@@ -153,7 +153,7 @@
DIRECTX_DIR := $(BUILDROOT)/directx-dev
DIRECTX_ARCHIVE := directx-dev.tar.gz
-FFMPEG_VER := 10521
+FFMPEG_VER := 12758
FFMPEG_URL := svn://svn.mplayerhq.hu/ffmpeg/trunk
FFMPEG_DIR := $(BUILDROOT)/ffmpeg
FFMPEG_ARCHIVE := ffmpeg
@@ -200,7 +200,7 @@
--disable-dbus --disable-avahi --disable-esd --with-ldap-dir=$(OPENLDAP_DIR)
confffmpeg:=--cross-prefix=i586-mingw32msvc- --enable-shared --enable-memalign-hack \
- --cross-compile --disable-ffserver --target-os=mingw32 \
+ --enable-cross-compile --disable-ffserver --target-os=mingw32 \
--enable-w32threads --arch=i686 \
--disable-parsers --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=h263 \
--disable-decoders --enable-decoder=h264 --enable-decoder=mpeg4 --enable-decoder=h263 \
@@ -417,6 +417,7 @@
touch $@
$(BINDIR)/avcodec.dll: $(FFMPEG_DIR)/config.status
+ mkdir $(INCLUDEDIR)/ffmpeg
$(MAKE) $(MAKE_LIB_OPTS) -C $(FFMPEG_DIR)
$(MAKE) -C $(FFMPEG_DIR) install
$(CP) $(FFMPEG_DIR)/libavutil/intreadwrite.h $(INCLUDEDIR)/ffmpeg
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]