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

Update ffmpeg header version

Browse Source 
Signed-off-by: Laentir Valetov <laex@bk.ru>
This commit is contained in:
Laentir Valetov 2018-09-14 21:10:53 +04:00
parent 687881bf9c
commit 294972d6a3
12 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CheckCVDep/CheckCVDep.dproj
View File

@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{E11F6D25-6ADF-429B-8B8B-AFAF67B0A6EB}</ProjectGuid> <ProjectGuid>{E11F6D25-6ADF-429B-8B8B-AFAF67B0A6EB}</ProjectGuid>
<ProjectVersion>18.3</ProjectVersion> <ProjectVersion>18.4</ProjectVersion>
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<MainSource>CheckCVDep.dpr</MainSource> <MainSource>CheckCVDep.dpr</MainSource>
<Base>True</Base> <Base>True</Base>

BIN
CheckCVDep/CheckCVDep.exe
View File

Binary file not shown.

9
CheckCVDep/uMainForm.pas
View File

@ -25,6 +25,7 @@ var
implementation implementation
{$R *.dfm} {$R *.dfm}
{$I libversion.inc}
const const
@ -37,8 +38,8 @@ const
CVDLL_Classes: array of string = ['opencv_classes2413']; CVDLL_Classes: array of string = ['opencv_classes2413'];
FFMPEGDLL: array of string = ['avcodec-57', 'avdevice-57', 'avfilter-6', 'avformat-57', 'avutil-55', 'postproc-54', 'swresample-2', FFMPEGDLL: array of string = [ //
'swscale-4']; AVCODEC_LIBNAME, AVDEVICE_LIBNAME, AVFILTER_LIBNAME, AVFORMAT_LIBNAME, AVUTIL_LIBNAME, SWRESAMPLE_LIBNAME, SWSCALE_LIBNAME];
SDLDLL: array of string = ['SDL', 'SDL2']; SDLDLL: array of string = ['SDL', 'SDL2'];
@ -153,9 +154,9 @@ begin
R := True; R := True;
for i := 0 to High(FFMPEGDLL) do for i := 0 to High(FFMPEGDLL) do
begin begin
if not CheckLoadDLL(FFMPEGDLL[i] + '.dll', ErrorCode, ErrorString) then if not CheckLoadDLL(FFMPEGDLL[i], ErrorCode, ErrorString) then
begin begin
mmo1.Lines.Add('Verifying ' + FFMPEGDLL[i] + '.dll'); mmo1.Lines.Add('Verifying ' + FFMPEGDLL[i]);
mmo1.Lines.Add(' Error code: ' + ErrorCode.ToString + ' - ' + ErrorString); mmo1.Lines.Add(' Error code: ' + ErrorCode.ToString + ' - ' + ErrorString);
R := False; R := False;
end; end;

2
README.md
View File

@ -15,7 +15,7 @@ or from the repository:
(1) 32-bit in the "Delphi-OpenCV\redist\VC14\x86\" (1) 32-bit in the "Delphi-OpenCV\redist\VC14\x86\"
(2) 64-bit in the "Delphi-OpenCV\redist\VC14\x64\" (2) 64-bit in the "Delphi-OpenCV\redist\VC14\x64\"
``` ```
* Shared library FFMPEG 3.3.3 for Windows can be downloaded from [here][5]<br> * Shared library FFMPEG 3.4.2 for Windows can be downloaded from [here][5]<br>
``` ```
(3) FFmpeg 32-bit Shared (3) FFmpeg 32-bit Shared
(4) FFmpeg 64-bit Shared (4) FFmpeg 64-bit Shared

2
samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj
View File

@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{08BFF34B-6FF9-468C-9AB2-3F76BBC9E351}</ProjectGuid> <ProjectGuid>{08BFF34B-6FF9-468C-9AB2-3F76BBC9E351}</ProjectGuid>
<ProjectVersion>18.2</ProjectVersion> <ProjectVersion>18.4</ProjectVersion>
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<MainSource>cFFmpegIPCamSource.dpr</MainSource> <MainSource>cFFmpegIPCamSource.dpr</MainSource>
<Base>True</Base> <Base>True</Base>

28
source/component/Delphi 10.2 Tokyo/RAD Studio 10.2 Tokyo.groupproj
View File

@ -6,10 +6,10 @@
<Projects Include="dclCommonOpenCV250.dproj"> <Projects Include="dclCommonOpenCV250.dproj">
<Dependencies/> <Dependencies/>
</Projects> </Projects>
<Projects Include="dclFFMSource250.dproj"> <Projects Include="dclFMXOpenCV250.dproj">
<Dependencies/> <Dependencies/>
</Projects> </Projects>
<Projects Include="dclFMXOpenCV250.dproj"> <Projects Include="dclFFMSource250.dproj">
<Dependencies/> <Dependencies/>
</Projects> </Projects>
<Projects Include="dclVCLOpenCV250.dproj"> <Projects Include="dclVCLOpenCV250.dproj">
@ -32,15 +32,6 @@
<Target Name="dclCommonOpenCV250:Make"> <Target Name="dclCommonOpenCV250:Make">
<MSBuild Projects="dclCommonOpenCV250.dproj" Targets="Make"/> <MSBuild Projects="dclCommonOpenCV250.dproj" Targets="Make"/>
</Target> </Target>
<Target Name="dclFFMSource250">
<MSBuild Projects="dclFFMSource250.dproj"/>
</Target>
<Target Name="dclFFMSource250:Clean">
<MSBuild Projects="dclFFMSource250.dproj" Targets="Clean"/>
</Target>
<Target Name="dclFFMSource250:Make">
<MSBuild Projects="dclFFMSource250.dproj" Targets="Make"/>
</Target>
<Target Name="dclFMXOpenCV250"> <Target Name="dclFMXOpenCV250">
<MSBuild Projects="dclFMXOpenCV250.dproj"/> <MSBuild Projects="dclFMXOpenCV250.dproj"/>
</Target> </Target>
@ -50,6 +41,15 @@
<Target Name="dclFMXOpenCV250:Make"> <Target Name="dclFMXOpenCV250:Make">
<MSBuild Projects="dclFMXOpenCV250.dproj" Targets="Make"/> <MSBuild Projects="dclFMXOpenCV250.dproj" Targets="Make"/>
</Target> </Target>
<Target Name="dclFFMSource250">
<MSBuild Projects="dclFFMSource250.dproj"/>
</Target>
<Target Name="dclFFMSource250:Clean">
<MSBuild Projects="dclFFMSource250.dproj" Targets="Clean"/>
</Target>
<Target Name="dclFFMSource250:Make">
<MSBuild Projects="dclFFMSource250.dproj" Targets="Make"/>
</Target>
<Target Name="dclVCLOpenCV250"> <Target Name="dclVCLOpenCV250">
<MSBuild Projects="dclVCLOpenCV250.dproj"/> <MSBuild Projects="dclVCLOpenCV250.dproj"/>
</Target> </Target>
@ -60,13 +60,13 @@
<MSBuild Projects="dclVCLOpenCV250.dproj" Targets="Make"/> <MSBuild Projects="dclVCLOpenCV250.dproj" Targets="Make"/>
</Target> </Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="dclCommonOpenCV250;dclFFMSource250;dclFMXOpenCV250;dclVCLOpenCV250"/> <CallTarget Targets="dclCommonOpenCV250;dclFMXOpenCV250;dclFFMSource250;dclVCLOpenCV250"/>
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="dclCommonOpenCV250:Clean;dclFFMSource250:Clean;dclFMXOpenCV250:Clean;dclVCLOpenCV250:Clean"/> <CallTarget Targets="dclCommonOpenCV250:Clean;dclFMXOpenCV250:Clean;dclFFMSource250:Clean;dclVCLOpenCV250:Clean"/>
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="dclCommonOpenCV250:Make;dclFFMSource250:Make;dclFMXOpenCV250:Make;dclVCLOpenCV250:Make"/> <CallTarget Targets="dclCommonOpenCV250:Make;dclFMXOpenCV250:Make;dclFFMSource250:Make;dclVCLOpenCV250:Make"/>
</Target> </Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/> <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project> </Project>

2
source/component/Delphi 10.2 Tokyo/dclCommonOpenCV250.dproj
View File

@ -7,7 +7,7 @@
<TargetedPlatforms>1</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType> <AppType>Package</AppType>
<FrameworkType>None</FrameworkType> <FrameworkType>None</FrameworkType>
<ProjectVersion>18.3</ProjectVersion> <ProjectVersion>18.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

2
source/component/Delphi 10.2 Tokyo/dclFFMSource250.dproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{3BC74F10-002A-41D7-B09F-6458FF2CE8F4}</ProjectGuid> <ProjectGuid>{3BC74F10-002A-41D7-B09F-6458FF2CE8F4}</ProjectGuid>
<MainSource>dclFFMSource250.dpk</MainSource> <MainSource>dclFFMSource250.dpk</MainSource>
<ProjectVersion>18.3</ProjectVersion> <ProjectVersion>18.4</ProjectVersion>
<FrameworkType>None</FrameworkType> <FrameworkType>None</FrameworkType>
<Base>True</Base> <Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config> <Config Condition="'$(Config)'==''">Debug</Config>

2
source/component/Delphi 10.2 Tokyo/dclFMXOpenCV250.dproj
View File

@ -7,7 +7,7 @@
<TargetedPlatforms>1</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType> <AppType>Package</AppType>
<FrameworkType>None</FrameworkType> <FrameworkType>None</FrameworkType>
<ProjectVersion>18.3</ProjectVersion> <ProjectVersion>18.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

2
source/component/Delphi 10.2 Tokyo/dclVCLOpenCV250.dproj
View File

@ -7,7 +7,7 @@
<TargetedPlatforms>1</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType> <AppType>Package</AppType>
<FrameworkType>None</FrameworkType> <FrameworkType>None</FrameworkType>
<ProjectVersion>18.3</ProjectVersion> <ProjectVersion>18.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

2
source/ffmpeg/LICENSE.txt
View File

@ -1,7 +1,7 @@
FFmpeg Delphi/Pascal Headers and Examples License Agreement FFmpeg Delphi/Pascal Headers and Examples License Agreement
A modified part of FFVCL - Delphi FFmpeg VCL Components. A modified part of FFVCL - Delphi FFmpeg VCL Components.
Copyright (c) 2008-2016 DelphiFFmpeg.com Copyright (c) 2008-2018 DelphiFFmpeg.com
All rights reserved. All rights reserved.
http://www.DelphiFFmpeg.com http://www.DelphiFFmpeg.com

6
source/ffmpeg/Readme.txt
View File

@ -1,15 +1,15 @@
FFmpeg Delphi/Pascal Headers and Examples FFmpeg Delphi/Pascal Headers and Examples
Ported from FFmpeg 3.0.2 Ported from FFmpeg 3.4.2
Tested on Delphi 6 to Delphi 10.1 Berlin and FPC 2.6.4 (Win32 only) Tested on Delphi 6 to Delphi 10.2 Tokyo and FPC 3.0.2 (Win32 only)
********************************************************************* *********************************************************************
FFmpeg Delphi/Pascal Headers and Examples License Agreement FFmpeg Delphi/Pascal Headers and Examples License Agreement
A modified part of FFVCL - Delphi FFmpeg VCL Components. A modified part of FFVCL - Delphi FFmpeg VCL Components.
Copyright (c) 2008-2016 DelphiFFmpeg.com Copyright (c) 2008-2018 DelphiFFmpeg.com
All rights reserved. All rights reserved.
http://www.DelphiFFmpeg.com http://www.DelphiFFmpeg.com