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
359bd21b
Commit
359bd21b
authored
Jul 04, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: update 3.3.2
- ffmpeg 3.3 -> 3.3.2 - added VERSIONINFO
parent
7b8e6307
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
ffmpeg.cmake
3rdparty/ffmpeg/ffmpeg.cmake
+6
-6
readme.txt
3rdparty/ffmpeg/readme.txt
+4
-5
No files found.
3rdparty/ffmpeg/ffmpeg.cmake
View file @
359bd21b
# Binary branch name: ffmpeg/master_20170
418
# Binaries were created for OpenCV:
b993b9b7c7f6f5f37d10acacb2962812228410ba
set
(
FFMPEG_BINARIES_COMMIT
"
86c4a841055f2612774e85b4292bb20e5fe8a783
"
)
set
(
FFMPEG_FILE_HASH_BIN32
"
3dea5f7f009b44601fe95728328e0f9e
"
)
set
(
FFMPEG_FILE_HASH_BIN64
"
9debe701975ef074bd6661981f3f0716
"
)
set
(
FFMPEG_FILE_HASH_CMAKE
"
208c00f03d2f6f39fa6262649e0bfc8d
"
)
# Binary branch name: ffmpeg/master_20170
704
# Binaries were created for OpenCV:
f670a9927026629a4083e05a1612f0adcad7727e
set
(
FFMPEG_BINARIES_COMMIT
"
a86e53eb35737a50e5100e26af3aa1d29e810890
"
)
set
(
FFMPEG_FILE_HASH_BIN32
"
79c35cc654778e66237444bc562afbca
"
)
set
(
FFMPEG_FILE_HASH_BIN64
"
0dc72775ec3c14d1e049f51dc1280dbb
"
)
set
(
FFMPEG_FILE_HASH_CMAKE
"
ec59008da403fb18ab3c1ed66aed583b
"
)
function
(
download_win_ffmpeg script_var
)
set
(
${
script_var
}
""
PARENT_SCOPE
)
...
...
3rdparty/ffmpeg/readme.txt
View file @
359bd21b
...
...
@@ -16,19 +16,18 @@
The binaries are opencv_ffmpeg.dll (version for 32-bit Windows) and
opencv_ffmpeg_64.dll (version for 64-bit Windows).
See build_win32.txt for the build instructions, if you want to rebuild opencv_ffmpeg*.dll from scratch.
The pre-built opencv_ffmpeg*.dll is:
* LGPL library, not BSD libraries.
* Loaded at runtime by opencv_videoio module.
If it succeeds, ffmpeg can be used to decode/encode videos;
otherwise, other API is used.
FFMPEG build
contains H264 encoder based on the OpenH264 library, that should be installed separatell
y.
FFMPEG build
includes support for H264 encoder based on the OpenH264 librar
y.
OpenH264 Video Codec provided by Cisco Systems, Inc.
See https://github.com/cisco/openh264/releases for details and OpenH264 license.
Downloaded binary file can be placed into global system path (System32 or SysWOW64) or near application binaries.
You can also specify location of binary file via OPENH264_LIBRARY_PATH environment variable.
OpenH264 library should be installed separatelly. Downloaded binary file can be placed into global system path
(System32 or SysWOW64) or near application binaries (check documentation of "LoadLibrary" Win32 function from MSDN).
Or you can specify location of binary file via OPENH264_LIBRARY environment variable.
If LGPL/GPL software can not be supplied with your OpenCV-based product, simply exclude
opencv_ffmpeg*.dll from your distribution; OpenCV will stay fully functional except for the ability to
...
...
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