[xiph-commits] r11345 - in branches/theora-mmx: . lib win32
win32/VS2005 win32/VS2005/libtheora
giles at svn.xiph.org
giles at svn.xiph.org
Fri May 5 18:16:40 PDT 2006
Author: giles
Date: 2006-05-05 18:16:38 -0700 (Fri, 05 May 2006)
New Revision: 11345
Added:
branches/theora-mmx/win32/VS2005/
branches/theora-mmx/win32/VS2005/libtheora/
branches/theora-mmx/win32/VS2005/libtheora/libtheora.vcproj
Removed:
branches/theora-mmx/win32/VS2005/libtheora/
branches/theora-mmx/win32/VS2005/libtheora/libtheora.vcproj
Modified:
branches/theora-mmx/autogen.sh
branches/theora-mmx/lib/toplevel.c
Log:
Merge changes from trunk.
Modified: branches/theora-mmx/autogen.sh
===================================================================
--- branches/theora-mmx/autogen.sh 2006-05-05 01:13:21 UTC (rev 11344)
+++ branches/theora-mmx/autogen.sh 2006-05-06 01:16:38 UTC (rev 11345)
@@ -27,16 +27,20 @@
# do we need automake?
if test -r Makefile.am; then
- AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP`
+ AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am`
+ AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP`
+ if test x"$AM_NEEDED" = "x$AM_OPTIONS"; then
+ AM_NEEDED=""
+ fi
if test -z $AM_NEEDED; then
echo -n "checking for automake... "
AUTOMAKE=automake
ACLOCAL=aclocal
if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then
+ echo "yes"
+ else
echo "no"
AUTOMAKE=
- else
- echo "yes"
fi
else
echo -n "checking for automake $AM_NEEDED or later... "
@@ -105,15 +109,14 @@
echo " $ACLOCAL $ACLOCAL_FLAGS"
$ACLOCAL $ACLOCAL_FLAGS || exit 1
+echo " $LIBTOOLIZE --automake"
+$LIBTOOLIZE --automake || exit 1
echo " autoheader"
autoheader || exit 1
-echo " $LIBTOOLIZE --automake"
-$LIBTOOLIZE --automake || exit 1
echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
echo " autoconf"
autoconf || exit 1
-cd
cd $olddir
$srcdir/configure --enable-maintainer-mode "$@" && echo
Modified: branches/theora-mmx/lib/toplevel.c
===================================================================
--- branches/theora-mmx/lib/toplevel.c 2006-05-05 01:13:21 UTC (rev 11344)
+++ branches/theora-mmx/lib/toplevel.c 2006-05-06 01:16:38 UTC (rev 11345)
@@ -154,6 +154,11 @@
theora_read(opb,2,&ret);
ci->pixelformat=ret;
+ if(ci->pixelformat==OC_PF_RSVD)
+ return (OC_BADHEADER);
+ /* 4:2:2 and 4:4:4 not currently implemented */
+ else if(ci->pixelformat != OC_PF_420)
+ return (OC_IMPL);
/* spare configuration bits */
if ( theora_read(opb,3,&ret) == -1 )
Copied: branches/theora-mmx/win32/VS2005 (from rev 11298, trunk/theora/win32/VS2005)
Copied: branches/theora-mmx/win32/VS2005/libtheora (from rev 11298, trunk/theora/win32/VS2005/libtheora)
Deleted: branches/theora-mmx/win32/VS2005/libtheora/libtheora.vcproj
===================================================================
--- trunk/theora/win32/VS2005/libtheora/libtheora.vcproj 2006-04-27 18:06:15 UTC (rev 11298)
+++ branches/theora-mmx/win32/VS2005/libtheora/libtheora.vcproj 2006-05-06 01:16:38 UTC (rev 11345)
@@ -1,519 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libtheora"
- ProjectGUID="{653F3841-3F26-49B9-AFCF-091DB4B67031}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="2"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/libtheora.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4244;4267;4057;4100;4245"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="1"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release_SSE|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="1"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4244;4267;4057;4100;4245"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="1"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release_SSE2|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTHEORA_EXPORTS"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4244;4267;4057;4100;4245"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/libtheora.dll"
- LinkIncremental="1"
- ModuleDefinitionFile="..\..\libtheora.def"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- ImportLibrary="$(OutDir)/libtheora.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\..\lib\blockmap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\comment.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\dct.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\dct_decode.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\dct_encode.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\decode.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\encode.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\encoder_toplevel.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\frarray.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\frinit.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\huffman.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\idct.c"
- >
- </File>
- <File
- RelativePath="..\..\libtheora.def"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\mcomp.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\misc_common.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\pb.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\pp.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\quant.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\reconstruct.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\scan.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\toplevel.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\..\..\lib\block_inline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\encoder_internal.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\encoder_lookup.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\huffman.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\hufftables.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\mcomp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\pp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\quant_lookup.h"
- >
- </File>
- <File
- RelativePath="..\..\..\include\theora\theora.h"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\toplevel_lookup.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: branches/theora-mmx/win32/VS2005/libtheora/libtheora.vcproj (from rev 11298, trunk/theora/win32/VS2005/libtheora/libtheora.vcproj)
More information about the commits
mailing list