[Sumover-dev] [svn commit] r3937 - in vic/branches/mpeg4: . win32
win32/lib
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Thu Nov 16 05:22:08 GMT 2006
Author: barz
Date: Thu Nov 16 05:15:45 2006
New Revision: 3937
Added:
vic/branches/mpeg4/win32/ffmpeg_config.h
vic/branches/mpeg4/win32/lib/avcodec-51.dll (contents, props changed)
vic/branches/mpeg4/win32/lib/avcodec-51.lib (contents, props changed)
vic/branches/mpeg4/win32/lib/avcodec.dll (contents, props changed)
vic/branches/mpeg4/win32/lib/avutil-49.dll (contents, props changed)
vic/branches/mpeg4/win32/lib/avutil-49.lib (contents, props changed)
vic/branches/mpeg4/win32/lib/avutil.dll (contents, props changed)
vic/branches/mpeg4/win32/lib/libx264.dll (contents, props changed)
vic/branches/mpeg4/win32/lib/libx264.lib (contents, props changed)
vic/branches/mpeg4/win32/lib/swscale-0.dll (contents, props changed)
vic/branches/mpeg4/win32/lib/swscale-0.lib (contents, props changed)
vic/branches/mpeg4/win32/lib/swscale.dll (contents, props changed)
Modified:
vic/branches/mpeg4/codec/h263/h263.h
vic/branches/mpeg4/config_arch.h
vic/branches/mpeg4/configure.in
vic/branches/mpeg4/configure.in.head
vic/branches/mpeg4/vic.vcproj
Log:
* successfully build on win32 for the latest ffmpeg and x264 DLL
* solve blank video problem by excluding color-true.cpp color-hi.cpp from VC.
Modified: vic/branches/mpeg4/codec/h263/h263.h
==============================================================================
--- vic/branches/mpeg4/codec/h263/h263.h (original)
+++ vic/branches/mpeg4/codec/h263/h263.h Thu Nov 16 05:15:45 2006
@@ -1,6 +1,6 @@
/*
*/
-#include "config.h"
+#include "../../config.h"
#include "DataTypes.h"
#include "structs.h"
Modified: vic/branches/mpeg4/config_arch.h
==============================================================================
--- vic/branches/mpeg4/config_arch.h (original)
+++ vic/branches/mpeg4/config_arch.h Thu Nov 16 05:15:45 2006
@@ -5,7 +5,7 @@
#ifndef __POSTPROC_CONFIG_H__
#define __POSTPROC_CONFIG_H__ 1
-// #define ARCH_X86 1
+#define ARCH_X86 1
/* Runtime CPU detection */
#define HAVE_MMX
Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in (original)
+++ vic/branches/mpeg4/configure.in Thu Nov 16 05:15:45 2006
@@ -82,20 +82,24 @@
AC_ARG_ENABLE(ffmpeg-co, --disable-ffmpeg-co Enable or disable ffmpeg svn checkout, ffmpegco="no", ffmpegco="yes")
if test "$ffmpegco" = "yes" ; then
- echo "checking out ffmpeg from svn://svn.mplayerhq.hu/ffmpeg/trunk..."
- svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
- echo "Configuring ffmpeg..."
- cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg --enable-gpl --enable-swscaler; cd ..
+ if test ! -r "ffmpeg" ; then
+ echo "checking out ffmpeg from svn://svn.mplayerhq.hu/ffmpeg/trunk..."
+ svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+ echo "Configuring ffmpeg..."
+ cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg --enable-gpl --enable-swscaler; cd ..
+ fi
V_INCLUDE="$V_INCLUDE -Iffmpeg/include"
V_CODEC_LIB="$V_CODEC_LIB ffmpeg/lib/libavcodec.a ffmpeg/lib/libavutil.a ffmpeg/lib/libswscale.a"
fi
AC_ARG_ENABLE(x264-co, --disable-x264-co Enable or disable x264 svn checkout, x264co="no", x264co="yes")
if test "$x264co" = "yes" ; then
- echo "checking out x264 from svn co svn://svn.videolan.org/x264/trunk..."
- svn checkout svn://svn.videolan.org/x264/trunk x264
- echo "Configuring x264..."
- cd x264; ./configure --prefix=$V_PATH/x264; cd ..
+ if test ! -r "x264" ; then
+ echo "checking out x264 from svn co svn://svn.videolan.org/x264/trunk..."
+ svn checkout svn://svn.videolan.org/x264/trunk x264
+ echo "Configuring x264..."
+ cd x264; ./configure --prefix=$V_PATH/x264; cd ..
+ fi
V_INCLUDE="$V_INCLUDE -Ix264/include"
V_CODEC_LIB="$V_CODEC_LIB x264/lib/libx264.a"
fi
Modified: vic/branches/mpeg4/configure.in.head
==============================================================================
--- vic/branches/mpeg4/configure.in.head (original)
+++ vic/branches/mpeg4/configure.in.head Thu Nov 16 05:15:45 2006
@@ -71,14 +71,25 @@
fi
done
+aquatcl="no"
+aquatk="no"
+cygwin="no"
+mingw="no"
+
case "$target" in
*-*-darwin*)
- aquatcl=yes
- aquatk=yes
+ aquatcl="yes"
+ aquatk="yes"
;;
+ *-*-cygwin*)
+ cygwin="yes"
+ ;;
+ *-*-mingw*)
+ mingw="yes"
+ ;;
esac
-if test $aquatk != "yes"; then
+if test "$aquatk" != "yes" -a "$mingw" != "yes"; then
builtin(include, configure.in.x11)
fi
builtin(include, configure.in.tk)
Modified: vic/branches/mpeg4/vic.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.vcproj (original)
+++ vic/branches/mpeg4/vic.vcproj Thu Nov 16 05:15:45 2006
@@ -482,7 +482,7 @@
AdditionalOptions="/I ../common"
Optimization="0"
AdditionalIncludeDirectories=".\,render,rtp,net,win32,video,codec,codec\tmndec,codec\tmn-x,codec\jpeg,codec\p64,codec\h263,codec\mpeg,..\common\src,..\tk-8.0\win,..\tcl-8.0\win,..\tk-8.0\generic,..\tk-8.0\xlib,..\tcl-8.0\generic,..\IPv6Kit\inc,mst_wm\incls"
- PreprocessorDefinitions="__X264__;DEBUG;_DEBUG;DEBUG_MEM;WIN32;SIGRET=void;SIGARGS=int;NLAYER=8;ED_YBITS=4;VIC;USE_TIME;WINDOWS;HAVE_IPV6;NEED_INET_NTOP;NEED_INET_PTON;WINXP_IPV6"
+ PreprocessorDefinitions="DEBUG;_DEBUG;DEBUG_MEM;WIN32;SIGRET=void;SIGARGS=int;NLAYER=8;ED_YBITS=4;VIC;USE_TIME;WINDOWS;HAVE_IPV6;NEED_INET_NTOP;NEED_INET_PTON;WINXP_IPV6"
RuntimeLibrary="5"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Debug_IPv6_Win2000/vic.pch"
@@ -498,7 +498,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libswscale.lib avcodec.lib libx264.lib tklib.lib tcllib.lib wsock32.lib Ws2_32.lib winmm.lib vfw32.lib uclmm.lib strmiids.lib quartz.lib"
+ AdditionalDependencies="swscale-0.lib avutil-49.lib avcodec-51.lib libx264.lib tklib.lib tcllib.lib wsock32.lib Ws2_32.lib winmm.lib vfw32.lib uclmm.lib strmiids.lib quartz.lib"
OutputFile="$(ConfigurationName)/vic.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -11717,9 +11717,6 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\render\color-hi.cpp">
- </File>
- <File
RelativePath="render\color-hist.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -12015,9 +12012,6 @@
RelativePath=".\render\color-swscale.cpp">
</File>
<File
- RelativePath=".\render\color-true.cpp">
- </File>
- <File
RelativePath="render\color-yuv.cpp">
<FileConfiguration
Name="Debug|Win32">
Added: vic/branches/mpeg4/win32/ffmpeg_config.h
==============================================================================
--- (empty file)
+++ vic/branches/mpeg4/win32/ffmpeg_config.h Thu Nov 16 05:15:45 2006
@@ -0,0 +1,15 @@
+
+#define FFMPEG_CONFIGURATION " --cpu=pentium3 --enable-shared"
+#define TUNECPU generic
+#define HAVE_BUILTIN_VECTOR 1
+//#define HAVE_LRINTF 1
+#define CONFIG_ENCODERS 1
+#define CONFIG_DECODERS 1
+#define CONFIG_MPEGAUDIO_HP 1
+//#define CONFIG_WIN32 1
+#define HAVE_W32THREADS 1
+//#define HAVE_THREADS 0
+#define HAVE_MALLOC_H 1
+//#undef HAVE_MEMALIGN
+#define SIMPLE_IDCT 1
+#define restrict __restrict__
Added: vic/branches/mpeg4/win32/lib/avcodec-51.dll
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/avcodec-51.lib
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/avcodec.dll
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/avutil-49.dll
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/avutil-49.lib
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/avutil.dll
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/libx264.dll
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/libx264.lib
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/swscale-0.dll
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/swscale-0.lib
==============================================================================
Binary file. No diff available.
Added: vic/branches/mpeg4/win32/lib/swscale.dll
==============================================================================
Binary file. No diff available.
More information about the Sumover-dev
mailing list