diff --git a/CheckCVDep/CheckCVDep.dproj b/CheckCVDep/CheckCVDep.dproj index 6a4e68e..2730dfd 100644 --- a/CheckCVDep/CheckCVDep.dproj +++ b/CheckCVDep/CheckCVDep.dproj @@ -1,7 +1,7 @@  {E11F6D25-6ADF-429B-8B8B-AFAF67B0A6EB} - 18.5 + 18.7 VCL CheckCVDep.dpr True @@ -206,6 +206,12 @@ 1 + + + res\values + 1 + + res\drawable @@ -242,6 +248,36 @@ 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + res\drawable-small @@ -266,6 +302,12 @@ 1 + + + res\values + 1 + + 1 @@ -385,6 +427,17 @@ 1 + + + 1 + + + 1 + + + 1 + + 1 @@ -396,6 +449,39 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -407,6 +493,61 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -418,6 +559,116 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -451,6 +702,28 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 diff --git a/CheckCVDep/CheckCVDep.exe b/CheckCVDep/CheckCVDep.exe index e44d616..8968b3f 100644 Binary files a/CheckCVDep/CheckCVDep.exe and b/CheckCVDep/CheckCVDep.exe differ diff --git a/CheckCVDep/uMainForm.pas b/CheckCVDep/uMainForm.pas index ef62219..badbab2 100644 --- a/CheckCVDep/uMainForm.pas +++ b/CheckCVDep/uMainForm.pas @@ -26,20 +26,28 @@ var implementation {$R *.dfm} -{$I libversion.inc} +{$I ffmpeg.inc} const MSDLL_Core: array of string = ['concrt140', 'msvcp140', 'ucrtbase', 'vcruntime140']; - CVDLL_Core: array of string = ['opencv_calib3d2413', 'opencv_contrib2413', 'opencv_core2413', 'opencv_features2d2413', 'opencv_flann2413', 'opencv_gpu2413', 'opencv_highgui2413', - 'opencv_imgproc2413', 'opencv_legacy2413', 'opencv_ml2413', 'opencv_nonfree2413', 'opencv_objdetect2413', 'opencv_ocl2413', 'opencv_photo2413', 'opencv_stitching2413', - 'opencv_superres2413', 'opencv_video2413', 'opencv_videostab2413', 'opencv_ffmpeg2413']; + CVDLL_Core: array of string = ['opencv_calib3d2413', 'opencv_contrib2413', 'opencv_core2413', 'opencv_features2d2413', 'opencv_flann2413', 'opencv_gpu2413', + 'opencv_highgui2413', 'opencv_imgproc2413', 'opencv_legacy2413', 'opencv_ml2413', 'opencv_nonfree2413', 'opencv_objdetect2413', 'opencv_ocl2413', + 'opencv_photo2413', 'opencv_stitching2413', 'opencv_superres2413', 'opencv_video2413', 'opencv_videostab2413', 'opencv_ffmpeg2413']; CVDLL_Classes: array of string = ['opencv_classes2413']; FFMPEGDLL: array of string = [ // - AVCODEC_LIBNAME, AVDEVICE_LIBNAME, AVFILTER_LIBNAME, AVFORMAT_LIBNAME, AVUTIL_LIBNAME, SWRESAMPLE_LIBNAME, SWSCALE_LIBNAME]; + swscale_dll, // + avutil_dll, // + avcodec_dll, // + avdevice_dll, // + avformat_dll, // + postproc_dll, // + swresample_dll, // + avfilter_dll // + ]; SDLDLL: array of string = ['SDL', 'SDL2']; diff --git a/README.md b/README.md index b5993d2..4731f99 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ or from the repository: (1) 32-bit in the "Delphi-OpenCV\redist\VC14\x86\" (2) 64-bit in the "Delphi-OpenCV\redist\VC14\x64\" ``` -* Shared library FFMPEG 4.2 for Windows can be downloaded from [here][5]
+* Shared library FFMPEG 4.2.1 for Windows can be downloaded from [here][5]
``` (3) FFmpeg 32-bit Shared (4) FFmpeg 64-bit Shared diff --git a/source/Delphi-FFMPEG b/source/Delphi-FFMPEG index ed23a68..1c13d3c 160000 --- a/source/Delphi-FFMPEG +++ b/source/Delphi-FFMPEG @@ -1 +1 @@ -Subproject commit ed23a68bf58b5b2f19ad60673ed79a9389dd8b06 +Subproject commit 1c13d3c4087b4abab65a90d119a5168fe914257d diff --git a/source/ffmpeg/LICENSE.txt b/source/ffmpeg/LICENSE.txt deleted file mode 100644 index e08fe6d..0000000 --- a/source/ffmpeg/LICENSE.txt +++ /dev/null @@ -1,22 +0,0 @@ -FFmpeg Delphi/Pascal Headers and Examples License Agreement - -A modified part of FFVCL - Delphi FFmpeg VCL Components. -Copyright (c) 2008-2018 DelphiFFmpeg.com -All rights reserved. -http://www.DelphiFFmpeg.com - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -This source code is provided "as is" by DelphiFFmpeg.com without -warranty of any kind, either expressed or implied, including but not -limited to the implied warranties of merchantability and/or fitness -for a particular purpose. - -Please also notice the License agreement of FFmpeg libraries. diff --git a/source/ffmpeg/Readme.txt b/source/ffmpeg/Readme.txt deleted file mode 100644 index f815f7a..0000000 --- a/source/ffmpeg/Readme.txt +++ /dev/null @@ -1,30 +0,0 @@ -FFmpeg Delphi/Pascal Headers and Examples - -Ported from FFmpeg 4.0.2 - -Tested on Delphi 6 to Delphi 10.2 Tokyo and FPC 3.0.2 (Win32 only) - -********************************************************************* - -FFmpeg Delphi/Pascal Headers and Examples License Agreement - -A modified part of FFVCL - Delphi FFmpeg VCL Components. -Copyright (c) 2008-2018 DelphiFFmpeg.com -All rights reserved. -http://www.DelphiFFmpeg.com - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -This source code is provided "as is" by DelphiFFmpeg.com without -warranty of any kind, either expressed or implied, including but not -limited to the implied warranties of merchantability and/or fitness -for a particular purpose. - -Please also notice the License agreement of FFmpeg libraries. diff --git a/source/ocv.core_c.pas b/source/ocv.core_c.pas index fd1e6bc..d4ab80d 100644 --- a/source/ocv.core_c.pas +++ b/source/ocv.core_c.pas @@ -156,7 +156,7 @@ procedure cvResetImageROI(image: pIplImage); cdecl; {$EXTERNALSYM cvGetImageROI} function cvGetImageROI(const image: pIplImage): TCvRect; cdecl; -{ Allocates and initalizes CvMat header +{ Allocates and initializes CvMat header CVAPI(CvMat*) cvCreateMatHeader( int rows, int cols, int type ); } {$EXTERNALSYM cvCreateMatHeader}