Delphi/Delphi-OpenCV
1
0
Fork 0
mirror of https://github.com/Laex/Delphi-OpenCV.git synced 2024-11-15 07:45:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

FFMPEG updated

Browse Source 
Signed-off-by: Laentir Valetov <laex@bk.ru>
This commit is contained in:
Laentir Valetov 2014-11-12 09:07:22 +03:00
parent 2031643f47
commit 5419cd6631
46 changed files with 73 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/Win32/avcodec-55.dll → bin/Win32/avcodec-56.dll
View File

Binary file not shown.

BIN
bin/Win32/avdevice-55.dll → bin/Win32/avdevice-56.dll
View File

Binary file not shown.

BIN
bin/Win32/avfilter-3.dll
View File

Binary file not shown.

BIN
bin/Win32/avfilter-4.dll
View File

Binary file not shown.

BIN
bin/Win32/avfilter-5.dll Normal file
View File

Binary file not shown.

BIN
bin/Win32/avformat-55.dll → bin/Win32/avformat-56.dll
View File

Binary file not shown.

BIN
bin/Win32/avutil-52.dll
View File

Binary file not shown.

BIN
bin/Win32/avutil-54.dll Normal file
View File

Binary file not shown.

BIN
bin/Win32/postproc-52.dll
View File

Binary file not shown.

BIN
bin/Win32/postproc-53.dll Normal file
View File

Binary file not shown.

BIN
bin/Win32/swresample-0.dll
View File

Binary file not shown.

BIN
bin/Win32/swresample-1.dll Normal file
View File

Binary file not shown.

BIN
bin/Win32/swscale-2.dll
View File

Binary file not shown.

BIN
bin/Win32/swscale-3.dll Normal file
View File

Binary file not shown.

BIN
bin/Win64/avcodec-55.dll → bin/Win64/avcodec-56.dll
View File

Binary file not shown.

BIN
bin/Win64/avdevice-55.dll → bin/Win64/avdevice-56.dll
View File

Binary file not shown.

BIN
bin/Win64/avfilter-4.dll
View File

Binary file not shown.

BIN
bin/Win64/avfilter-5.dll Normal file
View File

Binary file not shown.

BIN
bin/Win64/avformat-55.dll
View File

Binary file not shown.

BIN
bin/Win64/avformat-56.dll Normal file
View File

Binary file not shown.

BIN
bin/Win64/avutil-52.dll
View File

Binary file not shown.

BIN
bin/Win64/avutil-54.dll Normal file
View File

Binary file not shown.

BIN
bin/Win64/postproc-52.dll
View File

Binary file not shown.

BIN
bin/Win64/postproc-53.dll Normal file
View File

Binary file not shown.

BIN
bin/Win64/swresample-0.dll
View File

Binary file not shown.

BIN
bin/Win64/swresample-1.dll Normal file
View File

Binary file not shown.

BIN
bin/Win64/swscale-2.dll
View File

Binary file not shown.

BIN
bin/Win64/swscale-3.dll Normal file
View File

Binary file not shown.

BIN
samples/Components/cCameraCapture/cCameraCapture.res
View File

Binary file not shown.

9
samples/Components/cFMXCameracapture/cFMXCameraCapture.dproj
View File

@ -77,6 +77,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<AUP_ACCESS_FINE_LOCATION>true</AUP_ACCESS_FINE_LOCATION>
@ -238,6 +244,9 @@
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_DebugInformation>0</DCC_DebugInformation>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=12.11.2014 9:04:42</VerInfo_Keys>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>

BIN
samples/Components/cFMXCameracapture/cFMXCameraCapture.res
View File

Binary file not shown.

BIN
samples/Components/cVideoWriter/cVideoWriter.res
View File

Binary file not shown.

10
source/component/Delphi21/OpenCV210.dpk
View File

@ -9,21 +9,21 @@ package OpenCV210;
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LOCALSYMBOLS OFF}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$REFERENCEINFO OFF}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV Component'}
{$RUNONLY}

9
source/component/Delphi21/OpenCV210.dproj
View File

@ -33,6 +33,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
@ -85,6 +91,9 @@
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=12.11.2014 9:02:09</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Optimize>false</DCC_Optimize>

BIN
source/component/Delphi21/OpenCV210.res
View File

Binary file not shown.

18
source/component/Delphi21/RAD Studio XE7.groupproj
View File

@ -15,9 +15,6 @@
<Projects Include="dclVCLOpenCV210.dproj">
<Dependencies>dclCommonOpenCV210.dproj</Dependencies>
</Projects>
<Projects Include="..\..\..\samples\Components\cFMXCameracapture\cFMXCameraCapture.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality.12</Borland.Personality>
@ -62,23 +59,14 @@
<Target Name="dclVCLOpenCV210:Make" DependsOnTargets="dclCommonOpenCV210:Make">
<MSBuild Projects="dclVCLOpenCV210.dproj" Targets="Make"/>
</Target>
<Target Name="cFMXCameraCapture">
<MSBuild Projects="..\..\..\samples\Components\cFMXCameracapture\cFMXCameraCapture.dproj"/>
</Target>
<Target Name="cFMXCameraCapture:Clean">
<MSBuild Projects="..\..\..\samples\Components\cFMXCameracapture\cFMXCameraCapture.dproj" Targets="Clean"/>
</Target>
<Target Name="cFMXCameraCapture:Make">
<MSBuild Projects="..\..\..\samples\Components\cFMXCameracapture\cFMXCameraCapture.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="OpenCV210;dclCommonOpenCV210;dclFMXOpenCV210;dclVCLOpenCV210;cFMXCameraCapture"/>
<CallTarget Targets="OpenCV210;dclCommonOpenCV210;dclFMXOpenCV210;dclVCLOpenCV210"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="OpenCV210:Clean;dclCommonOpenCV210:Clean;dclFMXOpenCV210:Clean;dclVCLOpenCV210:Clean;cFMXCameraCapture:Clean"/>
<CallTarget Targets="OpenCV210:Clean;dclCommonOpenCV210:Clean;dclFMXOpenCV210:Clean;dclVCLOpenCV210:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="OpenCV210:Make;dclCommonOpenCV210:Make;dclFMXOpenCV210:Make;dclVCLOpenCV210:Make;cFMXCameraCapture:Make"/>
<CallTarget Targets="OpenCV210:Make;dclCommonOpenCV210:Make;dclFMXOpenCV210:Make;dclVCLOpenCV210:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>

10
source/component/Delphi21/dclCommonOpenCV210.dpk
View File

@ -10,21 +10,21 @@ package dclCommonOpenCV210;
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LOCALSYMBOLS OFF}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$REFERENCEINFO OFF}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV Component'}
{$DESIGNONLY}

9
source/component/Delphi21/dclCommonOpenCV210.dproj
View File

@ -28,6 +28,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
@ -75,6 +81,9 @@
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=12.11.2014 9:02:33</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Optimize>false</DCC_Optimize>

BIN
source/component/Delphi21/dclCommonOpenCV210.res
View File

Binary file not shown.

10
source/component/Delphi21/dclFMXOpenCV210.dpk
View File

@ -10,21 +10,21 @@ package dclFMXOpenCV210;
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LOCALSYMBOLS OFF}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$REFERENCEINFO OFF}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV Component'}
{$DESIGNONLY}

9
source/component/Delphi21/dclFMXOpenCV210.dproj
View File

@ -48,6 +48,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
@ -108,6 +114,9 @@
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=12.11.2014 9:02:35</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Optimize>false</DCC_Optimize>

BIN
source/component/Delphi21/dclFMXOpenCV210.res
View File

Binary file not shown.

10
source/component/Delphi21/dclVCLOpenCV210.dpk
View File

@ -10,21 +10,21 @@ package dclVCLOpenCV210;
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LOCALSYMBOLS OFF}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$REFERENCEINFO OFF}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV Component'}
{$DESIGNONLY}

9
source/component/Delphi21/dclVCLOpenCV210.dproj
View File

@ -28,6 +28,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
@ -75,6 +81,9 @@
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=12.11.2014 9:02:36</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Optimize>false</DCC_Optimize>

BIN
source/component/Delphi21/dclVCLOpenCV210.res
View File

Binary file not shown.

10
source/ffmpeg/ffm.lib.pas
View File

@ -5,11 +5,11 @@ unit ffm.lib;
interface
const
avformat_dll = 'avformat-55.dll';
avcodec_dll = 'avcodec-55.dll';
avutil_dll = 'avutil-52.dll';
swscale_dll = 'swscale-2.dll';
avfilter_dll = 'avfilter-4.dll';
avformat_dll = 'avformat-56.dll';
avcodec_dll = 'avcodec-56.dll';
avutil_dll = 'avutil-54.dll';
swscale_dll = 'swscale-3.dll';
avfilter_dll = 'avfilter-5.dll';
avio_dll = avformat_dll;
samplefmt_dll = avutil_dll;
channel_layout_dll=avutil_dll;