Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
0492301e
Commit
0492301e
authored
6 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12753 from mshabunin:fix-ffmpeg-dl
parents
c716e374
09ef4c9c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
ffmpeg-download.ps1.in
3rdparty/ffmpeg/ffmpeg-download.ps1.in
+1
-1
ffmpeg.cmake
3rdparty/ffmpeg/ffmpeg.cmake
+2
-0
No files found.
3rdparty/ffmpeg/ffmpeg-download.ps1.in
View file @
0492301e
...
...
@@ -4,7 +4,7 @@ $output = "$PSScriptRoot\@OPENCV_BIN_INSTALL_PATH@\opencv_ffmpeg@OPENCV_DLLVERSI
Write-Output ("=" * 120)
try {
Get-content -Path "$PSScriptRoot\
etc\licenses
\ffmpeg-readme.txt" -ErrorAction 'Stop'
Get-content -Path "$PSScriptRoot\
@OPENCV_LICENSES_INSTALL_PATH@
\ffmpeg-readme.txt" -ErrorAction 'Stop'
} catch {
Write-Output "Refer to OpenCV FFmpeg wrapper readme notes about library usage / licensing details."
}
...
...
This diff is collapsed.
Click to expand it.
3rdparty/ffmpeg/ffmpeg.cmake
View file @
0492301e
...
...
@@ -40,3 +40,5 @@ if(OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT)
configure_file
(
"
${
CMAKE_CURRENT_LIST_DIR
}
/ffmpeg-download.ps1.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/ffmpeg-download.ps1"
@ONLY
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/ffmpeg-download.ps1"
DESTINATION
"."
COMPONENT libs
)
endif
()
ocv_install_3rdparty_licenses
(
ffmpeg license.txt readme.txt
)
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment